345 files changed, 74194 insertions, 49213 deletions

diff --git a/.gitignore b/.gitignore
index 42a6980d6..2f9c8690e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,6 +100,14 @@ build/toolchain.cmake1
 build/makerats.log
 build/make_hc.txt
 build/make_hc2.txt
+build/makecheck1
+build/makecheck2
+build/makecheck3
+build/makecheck4
+build/makecheck5
+build/makecheck6
+build/clmake
+build/bmakesnapshot
 
 # debian
 debian/*
diff --git a/ChangeLog b/ChangeLog
index 2474682d7..2ddfb696d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2012-02-19 New release 1.2.2.19
+add: client data translations (items, etc).
+add: increased max value for drop counter from 9 to 30.
+add: chat command /setdrop N. to set drop counter from scripts.
+add: hide map layers feature.
+add: show gms with green color in online list (evol server).
+add: relative position for floor items (item drops).
+add: option to enable/disable grouping friends in online list.
+add: enable chat logging by default.
+add: set default max chat lines to 40.
+add: update windows libs.
+add: center game on screen in windows and osx.
+add: race name to status and debug windows.
+add: update liberation and mplus fonts.
+
 2012-02-05 New release 1.2.2.5
 ManaPlus:
 fix: particle font in japan localisation.
diff --git a/README b/README
index d7e46430c..f2974689c 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT
 ===============
 
- Version: 1.2.2.5        Date: 2012-02-05
+ Version: 1.2.2.19        Date: 2012-02-19
 
  Development team:
   - See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index 4f4a397fc..8f99f0484 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 THE MANA PLUS CLIENT

 ===============

 

- Version: 1.2.2.5        Date: 2012-02-05

+ Version: 1.2.2.19        Date: 2012-02-19

 

  Development team:

   - See AUTHORS file for a list

diff --git a/build/bmake b/build/bmake
index d99766ea7..33df5d180 100755
--- a/build/bmake
+++ b/build/bmake
@@ -8,7 +8,6 @@ cd ..
 #for feature
 #-Wstrict-overflow=4 -Wfloat-equal
 #-Wunsafe-loop-optimizations
-#-Wnon-virtual-dtor
 #-Woverloaded-virtual
 #-Wformat=2
 #-Wswitch-enum
diff --git a/build/bmakesnapshot b/build/bmakesnapshot
deleted file mode 100755
index b13b31bfa..000000000
--- a/build/bmakesnapshot
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-cd ..
-
-dir=`pwd`
-
-export PATH=/usr/lib/gcc-snapshot/bin:$PATH
-export CC=gcc
-export CXX=g++
-
-export LANG=C
-
-export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \
--Wpacked-bitfield-compat -Wtrampolines \
--Wsuggest-attribute=noreturn -Wunused -Wstrict-aliasing=2 \
--fstrict-aliasing -Wunreachable-code -Wabi -Wdisabled-optimization \
--Wvolatile-register-var -Winvalid-pch -Wredundant-decls \
--Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \
--Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \
--Wctor-dtor-privacy -Wstrict-null-sentinel -Wlogical-op \
--Wcast-align -Wpointer-arith -Wundef \
--Wmissing-include-dirs -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \
--Wpacked -Wextra -Wstrict-overflow=1 -Wunknown-pragmas -Wwrite-strings \
--Wstack-protector -Wshadow -Wunused-macros -Wsynth \
--Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \
--Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \
--Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \
--Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \
--Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \
--Wnarrowing -Wzero-as-null-pointer-constant"
-
-autoreconf -i
-./configure --prefix=$dir/run \
---datadir=$dir/run/share/games \
---bindir=$dir/run/bin \
---mandir=$dir/run/share/man
-
-cd po
-#make -j5 update-po 2>../build/make1.log
-make -j5 update-gmo 2>../build/logs/gcc47.txt
-cd ..
-make -j5 2>build/make2.log
-
diff --git a/build/clmake b/build/clmake
deleted file mode 100755
index 3817e6b89..000000000
--- a/build/clmake
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-cd ..
-
-dir=`pwd`
-
-export LANG=C
-export CC=clang
-export CXX=clang++
-
-./configure --prefix=$dir/run \
---datadir=$dir/run/share/games \
---bindir=$dir/run/bin \
---mandir=$dir/run/share/man
-
-make -j5 2>build/logs/clang.txt
diff --git a/build/makecheck1 b/build/makecheck1
deleted file mode 100755
index 58f231e14..000000000
--- a/build/makecheck1
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v .. 1>makecheck.txt 2>logs/cppcheck1.txt
diff --git a/build/makecheck2 b/build/makecheck2
deleted file mode 100755
index 184903c7a..000000000
--- a/build/makecheck2
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-../../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ../src >logs/nsiqcppstyle.txt
diff --git a/build/makecheck3 b/build/makecheck3
deleted file mode 100755
index c09d002cb..000000000
--- a/build/makecheck3
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd ../src
-../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../build/makecheck.txt 2>../build/logs/cppcheck2.txt
diff --git a/build/makecheck4 b/build/makecheck4
deleted file mode 100755
index 946761892..000000000
--- a/build/makecheck4
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-../../checkheaders/checkheaders --skip debug.h ../src 2>tmp.txt
-sed '/(style): Header not found/d' tmp.txt >logs/checkheader.txt
-rm tmp.txt
diff --git a/build/makecheck5 b/build/makecheck5
deleted file mode 100755
index 9cf5450b6..000000000
--- a/build/makecheck5
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-find ../src -type f -name "*.cpp" -exec ../../vera++/vera++ {} \; 2>logs/vera.txt
-find ../src -type f -name "*.hpp" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt
-find ../src -type f -name "*.h" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt
-find ../src -type f -name "*.cc" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt
diff --git a/build/packevol b/build/packevol
index 9059fdf58..7f89238ab 100755
--- a/build/packevol
+++ b/build/packevol
@@ -7,7 +7,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
-    -DPRODUCT_VERSION="1.2.2.5" \
+    -DPRODUCT_VERSION="1.2.2.19" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     evol.nsi
diff --git a/build/packwin b/build/packwin
index 296039482..ab7087768 100755
--- a/build/packwin
+++ b/build/packwin
@@ -7,7 +7,7 @@ dir=`pwd`
 cd packaging/windows
 ./make-translations.sh
 makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
-    -DPRODUCT_VERSION="1.2.2.5" \
+    -DPRODUCT_VERSION="1.2.2.19" \
     -DEXESUFFIX=/src \
     -DUPX=true \
     setup.nsi
diff --git a/configure.ac b/configure.ac
index 996ad3f3c..ad5c8422d 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.2.2.5], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.2.2.19], [akaras@inbox.ru], [manaplus])
 AM_INIT_AUTOMAKE([1.9])
 AC_CONFIG_HEADERS([config.h:config.h.in])
 AC_LANG_CPLUSPLUS
@@ -252,6 +252,7 @@ Makefile
 PKGBUILD
 src/Makefile
 data/Makefile
+data/evol/Makefile
 data/fonts/Makefile
 data/graphics/Makefile
 data/graphics/gui/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 302f0feae..2d63a033e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = fonts graphics help icons perserver sfx themes
+SUBDIRS = evol fonts graphics help icons perserver sfx themes
 
 EXTRA_DIST = CMakeLists.txt items.xsd
 
diff --git a/data/evol/Makefile.am b/data/evol/Makefile.am
new file mode 100644
index 000000000..2bd86e257
--- /dev/null
+++ b/data/evol/Makefile.am
@@ -0,0 +1,17 @@
+
+desktopdir = $(datarootdir)/applications
+
+evol-client:
+	     mkdir -p "$(pkgdatadir)/data/evol/icons"
+	     cp evol.desktop "$(desktopdir)"
+	     cp evol.manaplus "$(pkgdatadir)/data/evol"
+	     cp icons/evol-client.png "$(pkgdatadir)/data/evol/icons"
+	     cp icons/evol-client.png "$(datarootdir)/icons"
+	     cp -r images "$(pkgdatadir)/data/evol"
+
+EXTRA_DIST = evol.desktop \
+	    evol.manaplus \
+	    icons/evol-client.ico \
+	    icons/evol-client.png \
+	    icons/evol-client.xpm \
+	    images/loginwallpaper_800x600.png
diff --git a/data/evol/evol.manaplus b/data/evol/evol.manaplus
index 63a963495..9c4743852 100644
--- a/data/evol/evol.manaplus
+++ b/data/evol/evol.manaplus
@@ -6,6 +6,7 @@
  <option name="appIcon" value="evol/icons/evol-client"/>
  <option name="loginMusic" value="Artis - The Adventure Begins.ogg"/>
  <option name="onlineServerList" value="http://www.evolonline.org/serverlist.xml"/>
+ <option name="onlineServerFile" value="evol.xml"/>
  <option name="defaultServer" value="world.evolonline.org"/>
  <option name="defaultPort" value="6901"/>
  <option name="defaultServerType" value="evol"/>
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt
index aba42b39c..b262a5ac3 100644
--- a/data/graphics/gui/CMakeLists.txt
+++ b/data/graphics/gui/CMakeLists.txt
@@ -3,6 +3,7 @@ SET (FILES
     button.png
     button_disabled.png
     buttonhi.png
+    buttonplay.png
     buttonpress.png
     checkbox.png
     circle-gray.png
diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am
index 7fb82f545..6f294fa45 100644
--- a/data/graphics/gui/Makefile.am
+++ b/data/graphics/gui/Makefile.am
@@ -6,6 +6,7 @@ gui_DATA =				\
 	button.png			\
 	button_disabled.png		\
 	buttonhi.png			\
+	buttonplay.png			\
 	buttonpress.png			\
 	checkbox.png			\
 	circle-gray.png			\
diff --git a/data/graphics/gui/buttonplay.png b/data/graphics/gui/buttonplay.png
new file mode 100644
index 000000000..cd3a2c3db
--- /dev/null
+++ b/data/graphics/gui/buttonplay.png
diff --git a/data/sfx/system/CMakeLists.txt b/data/sfx/system/CMakeLists.txt
index bf6f0f0f3..0fa325a45 100644
--- a/data/sfx/system/CMakeLists.txt
+++ b/data/sfx/system/CMakeLists.txt
@@ -1,5 +1,21 @@
 SET (FILES
+    attention.ogg
+    chat1.ogg
+    chat2.ogg
+    complete.ogg
+    email.ogg
+    error.ogg
+    finish.ogg
+    incoming.ogg
+    move.ogg
+    notify.ogg
     newmessage.ogg
+    offline.ogg
+    online.ogg
+    reminder.ogg
+    send.ogg
+    start.ogg
+    watcher.ogg
     )
 
 INSTALL(FILES ${FILES} DESTINATION ${DATA_DIR}/sfx/system)
diff --git a/data/sfx/system/Makefile.am b/data/sfx/system/Makefile.am
index e744932c3..d46934461 100644
--- a/data/sfx/system/Makefile.am
+++ b/data/sfx/system/Makefile.am
@@ -1,7 +1,23 @@
 systemdir = $(pkgdatadir)/data/sfx/system
 
 system_DATA =				\
-	newmessage.ogg
+	attention.ogg \
+	chat1.ogg \
+	chat2.ogg \
+	complete.ogg \
+	email.ogg \
+	error.ogg \
+	finish.ogg \
+	incoming.ogg \
+	move.ogg \
+	newmessage.ogg \
+	notify.ogg \
+	offline.ogg \
+	online.ogg \
+	reminder.ogg \
+	send.ogg \
+	start.ogg \
+	watcher.ogg
 
 EXTRA_DIST =				\
 	$(system_DATA) \
diff --git a/data/sfx/system/attention.ogg b/data/sfx/system/attention.ogg
new file mode 100644
index 000000000..929265775
--- /dev/null
+++ b/data/sfx/system/attention.ogg
diff --git a/data/sfx/system/chat1.ogg b/data/sfx/system/chat1.ogg
new file mode 100644
index 000000000..ad6c52a1d
--- /dev/null
+++ b/data/sfx/system/chat1.ogg
diff --git a/data/sfx/system/chat2.ogg b/data/sfx/system/chat2.ogg
new file mode 100644
index 000000000..155b15e1f
--- /dev/null
+++ b/data/sfx/system/chat2.ogg
diff --git a/data/sfx/system/complete.ogg b/data/sfx/system/complete.ogg
new file mode 100644
index 000000000..0975ff7c8
--- /dev/null
+++ b/data/sfx/system/complete.ogg
diff --git a/data/sfx/system/email.ogg b/data/sfx/system/email.ogg
new file mode 100644
index 000000000..afb25909f
--- /dev/null
+++ b/data/sfx/system/email.ogg
diff --git a/data/sfx/system/error.ogg b/data/sfx/system/error.ogg
new file mode 100644
index 000000000..69dccfe7c
--- /dev/null
+++ b/data/sfx/system/error.ogg
diff --git a/data/sfx/system/finish.ogg b/data/sfx/system/finish.ogg
new file mode 100644
index 000000000..d8dbbf80f
--- /dev/null
+++ b/data/sfx/system/finish.ogg
diff --git a/data/sfx/system/incoming.ogg b/data/sfx/system/incoming.ogg
new file mode 100644
index 000000000..a8ff86676
--- /dev/null
+++ b/data/sfx/system/incoming.ogg
diff --git a/data/sfx/system/move.ogg b/data/sfx/system/move.ogg
new file mode 100644
index 000000000..e5c703bbf
--- /dev/null
+++ b/data/sfx/system/move.ogg
diff --git a/data/sfx/system/notify.ogg b/data/sfx/system/notify.ogg
new file mode 100644
index 000000000..95d8fed4a
--- /dev/null
+++ b/data/sfx/system/notify.ogg
diff --git a/data/sfx/system/offline.ogg b/data/sfx/system/offline.ogg
new file mode 100644
index 000000000..cc1b8e938
--- /dev/null
+++ b/data/sfx/system/offline.ogg
diff --git a/data/sfx/system/online.ogg b/data/sfx/system/online.ogg
new file mode 100644
index 000000000..3e55793fd
--- /dev/null
+++ b/data/sfx/system/online.ogg
diff --git a/data/sfx/system/reminder.ogg b/data/sfx/system/reminder.ogg
new file mode 100644
index 000000000..d7beeed6f
--- /dev/null
+++ b/data/sfx/system/reminder.ogg
diff --git a/data/sfx/system/send.ogg b/data/sfx/system/send.ogg
new file mode 100644
index 000000000..b5941323d
--- /dev/null
+++ b/data/sfx/system/send.ogg
diff --git a/data/sfx/system/start.ogg b/data/sfx/system/start.ogg
new file mode 100644
index 000000000..0b1f85643
--- /dev/null
+++ b/data/sfx/system/start.ogg
diff --git a/data/sfx/system/watcher.ogg b/data/sfx/system/watcher.ogg
new file mode 100644
index 000000000..9a0dd1af2
--- /dev/null
+++ b/data/sfx/system/watcher.ogg
diff --git a/data/themes/blackwood/Makefile.am b/data/themes/blackwood/Makefile.am
index 31cb547c1..52463440e 100644
--- a/data/themes/blackwood/Makefile.am
+++ b/data/themes/blackwood/Makefile.am
@@ -34,12 +34,6 @@ gui_DATA =				\
 	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		\
 	vscroll_down_default.png	\
 	vscroll_down_highlight.png	\
 	vscroll_down_pressed.png	\
diff --git a/data/themes/blackwood/target-cursor-blue-l.png b/data/themes/blackwood/target-cursor-blue-l.png
deleted file mode 100644
index 88d0bf40e..000000000
--- a/data/themes/blackwood/target-cursor-blue-l.png
+++ /dev/null
diff --git a/data/themes/blackwood/target-cursor-blue-m.png b/data/themes/blackwood/target-cursor-blue-m.png
deleted file mode 100644
index ac0189d0f..000000000
--- a/data/themes/blackwood/target-cursor-blue-m.png
+++ /dev/null
diff --git a/data/themes/blackwood/target-cursor-blue-s.png b/data/themes/blackwood/target-cursor-blue-s.png
deleted file mode 100644
index 90b22d72d..000000000
--- a/data/themes/blackwood/target-cursor-blue-s.png
+++ /dev/null
diff --git a/data/themes/blackwood/target-cursor-red-l.png b/data/themes/blackwood/target-cursor-red-l.png
deleted file mode 100644
index 776c8acdf..000000000
--- a/data/themes/blackwood/target-cursor-red-l.png
+++ /dev/null
diff --git a/data/themes/blackwood/target-cursor-red-m.png b/data/themes/blackwood/target-cursor-red-m.png
deleted file mode 100644
index af657dc14..000000000
--- a/data/themes/blackwood/target-cursor-red-m.png
+++ /dev/null
diff --git a/data/themes/blackwood/target-cursor-red-s.png b/data/themes/blackwood/target-cursor-red-s.png
deleted file mode 100644
index 090ec040d..000000000
--- a/data/themes/blackwood/target-cursor-red-s.png
+++ /dev/null
diff --git a/data/themes/pink/CMakeLists.txt b/data/themes/pink/CMakeLists.txt
index f6f6e81f6..56b11fb87 100644
--- a/data/themes/pink/CMakeLists.txt
+++ b/data/themes/pink/CMakeLists.txt
@@ -5,8 +5,6 @@ SET (FILES
     buttonhi.png
     buttonpress.png
     checkbox.png
-    circle-gray.png
-    circle-green.png
     close_button.png
     colors.xml
     deepbox.png
@@ -17,7 +15,6 @@ SET (FILES
     hscroll_right_highlight.png
     hscroll_right_pressed.png
     item_shortcut_bgr.png
-    mouse.png
     progress-indicator.png
     radioin.png
     radioin_highlight.png
@@ -27,17 +24,10 @@ SET (FILES
     selection.png
     slider.png
     slider_hilight.png
-    speechbubble.xml
     sticky_button.png
     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/themes/pink/Makefile.am b/data/themes/pink/Makefile.am
index 5fd4904f5..54d84bd97 100644
--- a/data/themes/pink/Makefile.am
+++ b/data/themes/pink/Makefile.am
@@ -8,8 +8,6 @@ gui_DATA =				\
 	buttonhi.png			\
 	buttonpress.png			\
 	checkbox.png			\
-	circle-gray.png			\
-	circle-green.png		\
 	close_button.png		\
 	colors.xml		\
 	deepbox.png			\
@@ -21,7 +19,6 @@ gui_DATA =				\
 	hscroll_right_highlight.png	\
 	hscroll_right_pressed.png	\
 	item_shortcut_bgr.png		\
-	mouse.png			\
 	progress-indicator.png		\
 	radioin.png			\
 	radioin_highlight.png		\
@@ -31,17 +28,10 @@ gui_DATA =				\
 	selection.png			\
 	slider.png			\
 	slider_hilight.png		\
-	speechbubble.xml		\
 	sticky_button.png		\
 	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/themes/pink/circle-gray.png b/data/themes/pink/circle-gray.png
deleted file mode 100644
index 3e884f405..000000000
--- a/data/themes/pink/circle-gray.png
+++ /dev/null
diff --git a/data/themes/pink/circle-green.png b/data/themes/pink/circle-green.png
deleted file mode 100644
index 2c98e9ef1..000000000
--- a/data/themes/pink/circle-green.png
+++ /dev/null
diff --git a/data/themes/pink/mouse.png b/data/themes/pink/mouse.png
deleted file mode 100644
index df460e49c..000000000
--- a/data/themes/pink/mouse.png
+++ /dev/null
diff --git a/data/themes/pink/speechbubble.xml b/data/themes/pink/speechbubble.xml
deleted file mode 100644
index 84b6557b3..000000000
--- a/data/themes/pink/speechbubble.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<skinset name="SpeechBubble" image="bubble.png">
-    <widget type="Window">
-        <!-- Top Row -->
-        <part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
-	<part type="top-edge" xpos="5" ypos="0" width="5" height="5" />
-	<part type="top-right-corner" xpos="10" ypos="0" width="5" height="5" />
-
-	<!-- Middle Row -->
-	<part type="left-edge" xpos="0" ypos="5" width="5" height="5" />
-	<part type="bg-quad" xpos="5" ypos="5" width="5" height="5" />
-	<part type="right-edge" xpos="10" ypos="5" width="5" height="5" />
-
-	<!-- Bottom Row -->
-	<part type="bottom-left-corner" xpos="0" ypos="10" width="5" height="5" />
-	<part type="bottom-edge" xpos="5" ypos="10" width="5" height="5" />
-	<part type="bottom-right-corner" xpos="10" ypos="10" width="5" height="5" />
-	</widget>
-</skinset>
diff --git a/data/themes/pink/target-cursor-blue-l.png b/data/themes/pink/target-cursor-blue-l.png
deleted file mode 100644
index 77cdf4b6d..000000000
--- a/data/themes/pink/target-cursor-blue-l.png
+++ /dev/null
diff --git a/data/themes/pink/target-cursor-blue-m.png b/data/themes/pink/target-cursor-blue-m.png
deleted file mode 100644
index c0107357a..000000000
--- a/data/themes/pink/target-cursor-blue-m.png
+++ /dev/null
diff --git a/data/themes/pink/target-cursor-blue-s.png b/data/themes/pink/target-cursor-blue-s.png
deleted file mode 100644
index 3e81c75de..000000000
--- a/data/themes/pink/target-cursor-blue-s.png
+++ /dev/null
diff --git a/data/themes/pink/target-cursor-red-l.png b/data/themes/pink/target-cursor-red-l.png
deleted file mode 100644
index 76d2101b1..000000000
--- a/data/themes/pink/target-cursor-red-l.png
+++ /dev/null
diff --git a/data/themes/pink/target-cursor-red-m.png b/data/themes/pink/target-cursor-red-m.png
deleted file mode 100644
index e2ab79c29..000000000
--- a/data/themes/pink/target-cursor-red-m.png
+++ /dev/null
diff --git a/data/themes/pink/target-cursor-red-s.png b/data/themes/pink/target-cursor-red-s.png
deleted file mode 100644
index 09195f440..000000000
--- a/data/themes/pink/target-cursor-red-s.png
+++ /dev/null
diff --git a/data/themes/redandblack/CMakeLists.txt b/data/themes/redandblack/CMakeLists.txt
index 22408ceae..e07edacb1 100644
--- a/data/themes/redandblack/CMakeLists.txt
+++ b/data/themes/redandblack/CMakeLists.txt
@@ -26,18 +26,10 @@ SET (FILES
     selection.png
     slider.png
     slider_hilight.png
-    speechbubble.xml
     sticky_button.png
     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
     vscroll_down_pressed.png
diff --git a/data/themes/redandblack/Makefile.am b/data/themes/redandblack/Makefile.am
index 24b9920cb..bee931d4f 100644
--- a/data/themes/redandblack/Makefile.am
+++ b/data/themes/redandblack/Makefile.am
@@ -30,18 +30,10 @@ gui_DATA =				\
 	selection.png			\
 	slider.png			\
 	slider_hilight.png		\
-	speechbubble.xml		\
 	sticky_button.png		\
 	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	\
 	vscroll_down_pressed.png	\
diff --git a/data/themes/redandblack/speechbubble.xml b/data/themes/redandblack/speechbubble.xml
deleted file mode 100644
index 84b6557b3..000000000
--- a/data/themes/redandblack/speechbubble.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<skinset name="SpeechBubble" image="bubble.png">
-    <widget type="Window">
-        <!-- Top Row -->
-        <part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
-	<part type="top-edge" xpos="5" ypos="0" width="5" height="5" />
-	<part type="top-right-corner" xpos="10" ypos="0" width="5" height="5" />
-
-	<!-- Middle Row -->
-	<part type="left-edge" xpos="0" ypos="5" width="5" height="5" />
-	<part type="bg-quad" xpos="5" ypos="5" width="5" height="5" />
-	<part type="right-edge" xpos="10" ypos="5" width="5" height="5" />
-
-	<!-- Bottom Row -->
-	<part type="bottom-left-corner" xpos="0" ypos="10" width="5" height="5" />
-	<part type="bottom-edge" xpos="5" ypos="10" width="5" height="5" />
-	<part type="bottom-right-corner" xpos="10" ypos="10" width="5" height="5" />
-	</widget>
-</skinset>
diff --git a/data/themes/redandblack/target-cursor-blue-l.png b/data/themes/redandblack/target-cursor-blue-l.png
deleted file mode 100644
index cd6aaa225..000000000
--- a/data/themes/redandblack/target-cursor-blue-l.png
+++ /dev/null
diff --git a/data/themes/redandblack/target-cursor-blue-m.png b/data/themes/redandblack/target-cursor-blue-m.png
deleted file mode 100644
index d961cd363..000000000
--- a/data/themes/redandblack/target-cursor-blue-m.png
+++ /dev/null
diff --git a/data/themes/redandblack/target-cursor-blue-s.png b/data/themes/redandblack/target-cursor-blue-s.png
deleted file mode 100644
index c9edefe48..000000000
--- a/data/themes/redandblack/target-cursor-blue-s.png
+++ /dev/null
diff --git a/data/themes/redandblack/target-cursor-red-l.png b/data/themes/redandblack/target-cursor-red-l.png
deleted file mode 100644
index de9337e6a..000000000
--- a/data/themes/redandblack/target-cursor-red-l.png
+++ /dev/null
diff --git a/data/themes/redandblack/target-cursor-red-m.png b/data/themes/redandblack/target-cursor-red-m.png
deleted file mode 100644
index 8e669f6f7..000000000
--- a/data/themes/redandblack/target-cursor-red-m.png
+++ /dev/null
diff --git a/data/themes/redandblack/target-cursor-red-s.png b/data/themes/redandblack/target-cursor-red-s.png
deleted file mode 100644
index 0dd1e0d7c..000000000
--- a/data/themes/redandblack/target-cursor-red-s.png
+++ /dev/null
diff --git a/data/themes/redandblack/unknown-item.png b/data/themes/redandblack/unknown-item.png
deleted file mode 100644
index 9201d688e..000000000
--- a/data/themes/redandblack/unknown-item.png
+++ /dev/null
diff --git a/data/themes/wood/CMakeLists.txt b/data/themes/wood/CMakeLists.txt
index 153e4d04b..797b29f9e 100644
--- a/data/themes/wood/CMakeLists.txt
+++ b/data/themes/wood/CMakeLists.txt
@@ -1,12 +1,9 @@
 SET (FILES
-    bubble.png
     button.png
     button_disabled.png
     buttonhi.png
     buttonpress.png
     checkbox.png
-    circle-gray.png
-    circle-green.png
     close_button.png
     colors.xml
     deepbox.png
@@ -26,18 +23,10 @@ SET (FILES
     selection.png
     slider.png
     slider_hilight.png
-    speechbubble.xml
     sticky_button.png
     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
     vscroll_down_pressed.png
diff --git a/data/themes/wood/Makefile.am b/data/themes/wood/Makefile.am
index f9f04c254..78aba7d35 100644
--- a/data/themes/wood/Makefile.am
+++ b/data/themes/wood/Makefile.am
@@ -2,14 +2,11 @@
 guidir = $(pkgdatadir)/data/themes/wood
 
 gui_DATA =				\
-	bubble.png			\
 	button.png			\
 	button_disabled.png		\
 	buttonhi.png			\
 	buttonpress.png			\
 	checkbox.png			\
-	circle-gray.png			\
-	circle-green.png		\
 	close_button.png		\
 	colors.xml		\
 	deepbox.png			\
@@ -30,18 +27,10 @@ gui_DATA =				\
 	selection.png			\
 	slider.png			\
 	slider_hilight.png		\
-	speechbubble.xml		\
 	sticky_button.png		\
 	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	\
 	vscroll_down_pressed.png	\
diff --git a/data/themes/wood/bubble.png b/data/themes/wood/bubble.png
deleted file mode 100644
index 45322eb2e..000000000
--- a/data/themes/wood/bubble.png
+++ /dev/null
diff --git a/data/themes/wood/circle-gray.png b/data/themes/wood/circle-gray.png
deleted file mode 100644
index 3e884f405..000000000
--- a/data/themes/wood/circle-gray.png
+++ /dev/null
diff --git a/data/themes/wood/circle-green.png b/data/themes/wood/circle-green.png
deleted file mode 100644
index 2c98e9ef1..000000000
--- a/data/themes/wood/circle-green.png
+++ /dev/null
diff --git a/data/themes/wood/speechbubble.xml b/data/themes/wood/speechbubble.xml
deleted file mode 100644
index 84b6557b3..000000000
--- a/data/themes/wood/speechbubble.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<skinset name="SpeechBubble" image="bubble.png">
-    <widget type="Window">
-        <!-- Top Row -->
-        <part type="top-left-corner" xpos="0" ypos="0" width="5" height="5" />
-	<part type="top-edge" xpos="5" ypos="0" width="5" height="5" />
-	<part type="top-right-corner" xpos="10" ypos="0" width="5" height="5" />
-
-	<!-- Middle Row -->
-	<part type="left-edge" xpos="0" ypos="5" width="5" height="5" />
-	<part type="bg-quad" xpos="5" ypos="5" width="5" height="5" />
-	<part type="right-edge" xpos="10" ypos="5" width="5" height="5" />
-
-	<!-- Bottom Row -->
-	<part type="bottom-left-corner" xpos="0" ypos="10" width="5" height="5" />
-	<part type="bottom-edge" xpos="5" ypos="10" width="5" height="5" />
-	<part type="bottom-right-corner" xpos="10" ypos="10" width="5" height="5" />
-	</widget>
-</skinset>
diff --git a/data/themes/wood/target-cursor-blue-l.png b/data/themes/wood/target-cursor-blue-l.png
deleted file mode 100644
index 77cdf4b6d..000000000
--- a/data/themes/wood/target-cursor-blue-l.png
+++ /dev/null
diff --git a/data/themes/wood/target-cursor-blue-m.png b/data/themes/wood/target-cursor-blue-m.png
deleted file mode 100644
index c0107357a..000000000
--- a/data/themes/wood/target-cursor-blue-m.png
+++ /dev/null
diff --git a/data/themes/wood/target-cursor-blue-s.png b/data/themes/wood/target-cursor-blue-s.png
deleted file mode 100644
index 3e81c75de..000000000
--- a/data/themes/wood/target-cursor-blue-s.png
+++ /dev/null
diff --git a/data/themes/wood/target-cursor-red-l.png b/data/themes/wood/target-cursor-red-l.png
deleted file mode 100644
index 76d2101b1..000000000
--- a/data/themes/wood/target-cursor-red-l.png
+++ /dev/null
diff --git a/data/themes/wood/target-cursor-red-m.png b/data/themes/wood/target-cursor-red-m.png
deleted file mode 100644
index e2ab79c29..000000000
--- a/data/themes/wood/target-cursor-red-m.png
+++ /dev/null
diff --git a/data/themes/wood/target-cursor-red-s.png b/data/themes/wood/target-cursor-red-s.png
deleted file mode 100644
index 09195f440..000000000
--- a/data/themes/wood/target-cursor-red-s.png
+++ /dev/null
diff --git a/data/themes/wood/unknown-item.png b/data/themes/wood/unknown-item.png
deleted file mode 100644
index 9201d688e..000000000
--- a/data/themes/wood/unknown-item.png
+++ /dev/null
diff --git a/manaplus.desktop b/manaplus.desktop
index 3a9c234e5..97dad49f6 100644
--- a/manaplus.desktop
+++ b/manaplus.desktop
@@ -13,35 +13,13 @@ Categories=Game;AdventureGame;
 
 # Translations
 Comment[vls]=Nen 2D MMORPG client
-Name[vls]=ManaPlus
-Icon[vls]=manaplus
 Comment[ru]=Клиент к 2D MMORPG игре
-Name[ru]=ManaPlus
-Icon[ru]=manaplus
 Comment[it]=Un gioco fantasy online
-Name[it]=ManaPlus
-Icon[it]=manaplus
 Comment[ja]=2D�MMORPGクライアント
-Name[ja]=ManaPlus
-Icon[ja]=manaplus
 Comment[cs]=2D MMORPG klient
-Name[cs]=ManaPlus
-Icon[cs]=manaplus
 Comment[nl_BE]=Een 2D MMORPG client
-Name[nl_BE]=ManaPlus
-Icon[nl_BE]=manaplus
 Comment[de]=ein 2D MMORG Client
-Name[de]=ManaPlus
-Icon[de]=manaplus
 Comment[sv_SE]=Ett fantasyrollspel online
-Name[sv_SE]=ManaPlus
-Icon[sv_SE]=manaplus
 Comment[es]=Un cliente MMORPG 2D
-Name[es]=ManaPlus
-Icon[es]=manaplus
 Comment[fr]=Un jeu en ligne dans un univers fantastique
-Name[fr]=ManaPlus
-Icon[fr]=manaplus
 Comment[nl]=Een online role playing game
-Name[nl]=ManaPlus
-Icon[nl]=manaplus
diff --git a/manaplustest.desktop b/manaplustest.desktop
index f4e822116..005be4ea9 100644
--- a/manaplustest.desktop
+++ b/manaplustest.desktop
@@ -13,23 +13,11 @@ Categories=Game;AdventureGame;
 
 # Translations
 Comment[vls]=Droai wa test'n vo ManaPlus
-Name[vls]=ManaPlus (Tests)
-Icon[vls]=manaplus
 Comment[it]=Testa ManaPlus
-Name[it]=ManaPlus (Tests)
-Icon[it]=manaplus
 Comment[ja]=ManaPlus�テストラン�る
 Name[ja]=ManaPlus (テスト)
-Icon[ja]=manaplus
 Comment[nl_BE]=Draai enkele testen voor ManaPlus
-Name[nl_BE]=ManaPlus (Tests)
-Icon[nl_BE]=manaplus
 Comment[de]=Testlauf für ManaPlus
-Name[de]=ManaPlus (Tests)
-Icon[de]=manaplus
 Comment[es]=Ejecutar pruebas para ManaPlus
 Name[es]=ManaPlus (Pruebas)
-Icon[es]=manaplus
 Comment[fr]=Lancer le test pour ManaPlus
-Name[fr]=ManaPlus (Tests)
-Icon[fr]=manaplus
diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi
index 73554e0cf..5b84a2ff7 100644
--- a/packaging/windows/evol.nsi
+++ b/packaging/windows/evol.nsi
@@ -355,6 +355,13 @@ Section /o "Portable" SecPortable
   File "portable.xml"
 SectionEnd
 
+Section /o "Debugger" SecDebug
+  SetOutPath "$INSTDIR"
+  File "${DLLDIR}\gdb.exe"
+  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplus.exe"' "$INSTDIR\manaplus.exe" 1
+  CreateShortCut "$DESKTOP\EvolOnline (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplus.exe"' "$INSTDIR\manaplus.exe" 1
+SectionEnd
+
 Section /o "Evol Online music" SecEvolMusic
   AddSize 9787
   CreateDirectory "$INSTDIR\data\music"
@@ -376,6 +383,7 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecEvolMusic} "Background evol music. (If selected the evol music will be downloaded from the internet.)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDebug} "Install debugger for try to find stability problems."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 
@@ -412,8 +420,10 @@ Section Uninstall
 
   Delete "$SMPROGRAMS\EvolOnline\Uninstall.lnk"
   Delete "$DESKTOP\EvolOnline.lnk"
+  Delete "$DESKTOP\EvolOnline (debug).lnk"
   Delete "$DESKTOP\EvolOnline (tests).lnk"
   Delete "$SMPROGRAMS\EvolOnline\EvolOnline.lnk"
+  Delete "$SMPROGRAMS\EvolOnline\EvolOnline (debug).lnk"
   Delete "$SMPROGRAMS\EvolOnline\EvolOnline (no opengl).lnk"
   Delete "$SMPROGRAMS\EvolOnline\EvolOnline (safemode).lnk"
   Delete "$SMPROGRAMS\EvolOnline\EvolOnline (tests).lnk"
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index a68f9cbb2..e160204cb 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -356,6 +356,13 @@ Section /o "Portable" SecPortable
   File "portable.xml"
 SectionEnd
 
+Section /o "Debugger" SecDebug
+  SetOutPath "$INSTDIR"
+  File "${DLLDIR}\gdb.exe"
+  CreateShortCut "$SMPROGRAMS\Mana\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplus.exe"' "$INSTDIR\manaplus.exe"
+  CreateShortCut "$DESKTOP\ManaPlus (debug).lnk" '"$INSTDIR\gdb.exe"' '"$INSTDIR\manaplus.exe"' "$INSTDIR\manaplus.exe"
+SectionEnd
+
 Section /o "Evol Online music" SecEvolMusic
   AddSize 9787
   CreateDirectory "$INSTDIR\data\music"
@@ -396,10 +403,10 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SecEvol} "Create shortcuts for Evol Online."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecEvolMusic} "Background evol music. (If selected the evol music will be downloaded from the internet.)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDebug} "Install debugger for try to find stability problems."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 
-
 Section -AdditionalIcons
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
   CreateShortCut "$SMPROGRAMS\Mana\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
@@ -431,8 +438,10 @@ Section Uninstall
 
   Delete "$SMPROGRAMS\Mana\Uninstall.lnk"
   Delete "$DESKTOP\ManaPlus.lnk"
+  Delete "$DESKTOP\ManaPlus (debug).lnk"
   Delete "$DESKTOP\ManaPlus (tests).lnk"
   Delete "$SMPROGRAMS\Mana\ManaPlus.lnk"
+  Delete "$SMPROGRAMS\Mana\ManaPlus (debug).lnk"
   Delete "$SMPROGRAMS\Mana\ManaPlus (no opengl).lnk"
   Delete "$SMPROGRAMS\Mana\ManaPlus (safemode).lnk"
   Delete "$SMPROGRAMS\Mana\ManaPlus (tests).lnk"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 652b43d3f..f09dd3314 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -52,6 +52,7 @@ src/gui/setup_players.cpp
 src/gui/setup_relations.cpp
 src/gui/setup_theme.cpp
 src/gui/setup_video.cpp
+src/gui/setup_visual.cpp
 src/gui/shopwindow.cpp
 src/gui/skilldialog.cpp
 src/gui/socialwindow.cpp
@@ -68,6 +69,7 @@ src/gui/widgets/battletab.cpp
 src/gui/widgets/channeltab.cpp
 src/gui/widgets/chattab.cpp
 src/gui/widgets/guildchattab.cpp
+src/gui/widgets/namesmodel.cpp
 src/gui/widgets/setupitem.cpp
 src/gui/widgets/tradetab.cpp
 src/gui/widgets/whispertab.cpp
diff --git a/po/ar.po b/po/ar.po
index a253f69ff..1ccfdf1d5 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:47+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,220 +18,244 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "تثبيت"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr "مرئية"
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "خطأ"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -241,7 +266,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -252,7 +277,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -263,7 +288,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -274,7 +299,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -285,92 +310,92 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -379,23 +404,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -403,79 +429,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "شراء"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "مغادرة"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "بيع"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "إلغاء"
 
@@ -511,7 +541,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "كلمة السرّ:"
@@ -538,81 +568,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "إنشاء شخصيّة"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "الاسم:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "إنشاء"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "رجاء أن توزّع %d نقطة"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "يجب أن يكون طول اسمك على الأقل 4 محار�."
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "إحصائيات الشخصيّة جيّدة"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "رجاء حذ� %d نقطة"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "هل أنت متأكّد من حذ� هذه الشخصيّة؟"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr ""
 
@@ -620,120 +655,122 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "إلغاء التسجيل"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "حذ�"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -746,363 +783,409 @@ msgstr "نعم"
 msgid "No"
 msgstr "لا"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "المن�ذ:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "العتاد"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "تجريد من العتاد"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
-msgstr "الجردة"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr "الجردة"
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "استعمال العتاد"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "استخدام"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "قسم"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "إسقاط"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "انتقاء كمّيّة من المواد لإسقاطها."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "انتقاء كمّيّة من المواد لقسمها."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1113,7 +1196,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1124,138 +1207,137 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "ولوج"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "الخادوم:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "تسجيل"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "التّالي"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1268,345 +1350,382 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "تبديل الخادوم"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "تبديل الشخصيّة"
 
@@ -1650,200 +1769,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr "المن�ذ:"
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "إضا�ة"
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
-msgstr "رجاء طباعة عنوان ومن�ذ الخادوم."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "سمعيّ"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "سمعيّ"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "حجم صوت المؤثرّات"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "حجم صوت الموسيقا"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1891,41 +2049,41 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "تطبيق"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "تص�ير النوا�ذ"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "إضغط على الزرّ لبدأ المعايرة"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "معايرة"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "ت�عيل عصا الألعاب"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "عصا الألعاب"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "إيقا�"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "تدوير العصا"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1947,360 +2105,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr ""
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2316,408 +2574,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr ""
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
+msgstr "ملء الشاشة"
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
+msgstr "مؤشّر مخصّص"
+
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "واق�"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
+msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "منخ�ض"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
+msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "مرت�ع"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
-msgstr "ملء الشاشة"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
+msgstr "يجب إعادة التشغيل لت�عّل التغييرات."
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
-msgstr "مؤشّر مخصّص"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
+msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
+
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "مرئية"
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr "عتمة واجهة المستخدم"
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr "مؤثّرات محيطة"
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
-msgstr "يجب إعادة التشغيل لت�عّل التغييرات."
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "واق�"
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
-msgstr ""
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "منخ�ض"
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
-msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "مرت�ع"
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "مؤثّرات محيطة"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr "إضا�ة"
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "مهارات"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2725,502 +3016,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "المستوى: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3244,26 +3172,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr "أنت تقدّم:"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "تغيير"
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3271,33 +3199,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "الاسم: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "جار� الاتّصال..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3449,23 +3377,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3530,7 +3458,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3568,6 +3497,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3697,438 +3661,477 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4139,119 +4142,396 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4267,142 +4547,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr "القوّة:"
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr "خ�ّة الحركة:"
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr "نشاط:"
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr "ذكاء:"
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr "المهارة:"
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4436,418 +4704,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4861,160 +5125,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -5023,7 +5287,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -5032,7 +5296,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5041,7 +5305,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5050,7 +5314,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5320,41 +5584,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5362,129 +5626,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "مهاجمة %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "د�اع %+d"
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/bg.po b/po/bg.po
index 331135697..c35577066 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,340 +18,364 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "�епозната команда."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -359,23 +384,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -383,79 +409,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr ""
 
@@ -491,7 +521,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr ""
@@ -518,81 +548,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr ""
 
@@ -600,120 +635,122 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -726,508 +763,553 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1240,345 +1322,382 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -1622,200 +1741,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:64
-msgid "Sfx volume"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:65
-msgid "Music volume"
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1863,40 +2021,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1919,360 +2077,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr ""
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2288,408 +2546,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2697,502 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3216,26 +3144,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3243,33 +3171,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3421,23 +3349,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3502,7 +3430,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3540,6 +3469,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3669,557 +3633,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4235,142 +4515,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4404,418 +4672,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4829,160 +5093,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -4991,7 +5255,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -5000,7 +5264,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5009,7 +5273,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5018,7 +5282,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5288,41 +5552,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5330,129 +5594,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/ca.po b/po/ca.po
index 3ce627303..e62272a67 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,340 +18,364 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -359,23 +384,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -383,79 +409,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "sortir"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr ""
 
@@ -491,7 +521,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr ""
@@ -518,81 +548,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "nom"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr ""
 
@@ -600,120 +635,122 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -726,508 +763,553 @@ msgstr "si"
 msgid "No"
 msgstr "no"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1240,345 +1322,382 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -1622,200 +1741,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:64
-msgid "Sfx volume"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:65
-msgid "Music volume"
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1863,40 +2021,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1919,360 +2077,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr ""
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2288,408 +2546,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2697,502 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3216,26 +3144,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "canvi"
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3243,33 +3171,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3421,23 +3349,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3502,7 +3430,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3540,6 +3469,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3669,557 +3633,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4235,142 +4515,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4404,418 +4672,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4829,160 +5093,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -4991,7 +5255,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -5000,7 +5264,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5009,7 +5273,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5018,7 +5282,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5288,41 +5552,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5330,129 +5594,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/cs.po b/po/cs.po
index 8759c9040..0362e6b13 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-02 16:45+0000\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
+"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/language/"
 "cs/)\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@@ -21,69 +21,73 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "úsko�il"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "minul"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Nastavení"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Výkon"
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Požaduji postavy"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Zaměňuji herní servery"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -93,63 +97,63 @@ msgstr "Zaměňuji herní servery"
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Požaduji registra�ní detaily"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Změna hesla"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "Změna emailu"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Neplatný host updatů: %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Chyba při vytváření adresáře s updaty!"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukon�uji."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Neznámý příkaz."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Nelze zaslat prázdné šeptání!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,105 +162,105 @@ msgstr ""
 "Nelze vytvořit záložku se šeptáním pro \"%s\"! Bu�to záložka existuje nebo "
 "jsi to ty."
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Chybí jméno party."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "Chybí jméno guildy."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Prosím zadej jméno."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Enter přepíná chat."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Zpráva zavírá chat."
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Enter nyní přepíná chat."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Zpráva nyní ukon�uje chat."
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "přítel"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "přehlížený"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "neutrální"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "Hrá� je již %s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Hrá� byl úspěšně zařazen jako %s!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Hrá� nemůže být zařazen jako %s!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "Hrá� nebyl ignorován!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "Hrá� již není ignorován!"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "Hrá� nemůže být odignorován!"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "Hrá� již byl vymazán!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "Hrá� byl úspěšně vymazán!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "Hrá� nemůže být vymazán!"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -264,7 +268,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -272,7 +276,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -280,7 +284,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -288,7 +292,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -296,27 +300,27 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "velikost chache fontů"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr "Velikost cache:"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "Vytvořeno:"
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "Odstraněno:"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -325,11 +329,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
@@ -390,18 +394,18 @@ msgstr "Komentář: %s"
 msgid "Bot Checker"
 msgstr "Ověřova� botů"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Jméno"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Útok"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Mluvit"
 
@@ -439,7 +443,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
@@ -447,25 +451,25 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Ukon�it"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "VÅ¡e"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Obchod"
 
@@ -489,8 +493,8 @@ msgstr "Prodej"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Zrušit"
@@ -663,8 +667,8 @@ msgid "Enter password:"
 msgstr "Zadej heslo:"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Smazat"
 
@@ -682,6 +686,7 @@ msgid "(empty)"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "výchozí"
 
@@ -739,24 +744,23 @@ msgstr "duhová 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Přítomno: %s; %d hrá�ů je přítomno."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šeptání pro %s: %s"
@@ -780,7 +784,7 @@ msgid "Ignore"
 msgstr "Ignorovat"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Mapa"
 
@@ -855,62 +859,76 @@ msgstr "Po�et textur:"
 msgid "Particle count: %d"
 msgstr "poet �ástic: %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Cíl:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "Id cíle:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
-msgstr "Úroveň cíle:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
-msgstr "Parta cíle:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
-msgstr "Gilda cíle:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "Prodleva útoku:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr "Minimální zásah:"
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr "Maximální zásah:"
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr "Kritický zásah:"
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Úroveň cíle:"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Parta cíle:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Gilda cíle:"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Příchozí: %d bytes/s"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Odchozí: %d bytes/s"
@@ -937,8 +955,8 @@ msgstr "Další >"
 msgid "Auto open this window"
 msgstr "Automaticky otevírat toto okno"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -1050,7 +1068,7 @@ msgstr "Hmotnost:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Uložit"
 
@@ -1109,55 +1127,55 @@ msgstr ""
 msgid "Weight: %s"
 msgstr "Váha: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Statistiky zabíjení"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "Resetovat statistiky"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "Reset �asomíry"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Úroveň: %d při %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d/%d Zbývá: %d"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, prům. mobů na 1%%: %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Zabitých: %s, celkem exp %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Prům exp: %s, Po�et prům mobů na další úroveň: %s"
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Zabitých/Min: %s, Exp/Min: %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1165,7 +1183,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1173,29 +1191,29 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "Exp za poslední zabití:"
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr "Čas do zrození Jack O:"
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "Čas do další úrovně: %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr "Jack O se rodí"
 
@@ -1296,7 +1314,7 @@ msgid "Submit"
 msgstr "Odeslat"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
@@ -1406,7 +1424,7 @@ msgstr "Odignorovat"
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "KompletnÄ› ignorovat"
 
@@ -1502,7 +1520,7 @@ msgstr "Vložit do seznamu ignorovaných"
 msgid "Add name to chat"
 msgstr "Vložit jméno do chatu"
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Hrá�i"
 
@@ -1669,12 +1687,12 @@ msgstr "Zobrazit"
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
@@ -1752,25 +1770,25 @@ msgstr "Připojit"
 msgid "Add"
 msgstr "Přidat"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Upravit"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Stahuji seznam serverů...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "Čekám na odezvu serveru..."
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Připravuji stažení"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "Chyba při získávání seznamu serverů!"
 
@@ -1783,156 +1801,188 @@ msgstr "potřebuje novější verzi"
 msgid "requires v%s"
 msgstr "potřebuje v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Zapnout audio"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "Zapnout hudbu"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "Zapnout zvukové efekty hry"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "Zapnout zvukové efekty gui"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "Zapnout hudbu"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "Povolit mumble hlasový chat"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "Stahovat hudbu"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Audio"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Hlasitost efektů"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Hlasitost hudby"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Upozornění"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
-"Možná budete muset restartovat váš klient, pokud chcete stáhnout novou hudbu"
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Zvukový systém"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "Ostatní"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "Povolit mumble hlasový chat"
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "Stahovat hudbu"
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Odstranit barvy z příchozích zpráv"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Zobrazit seznam barev"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "Příkazy"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Povolit magii a GM příkazy ve všech záložkách"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "Omezení"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Omezit maximum znaků na řádek"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Omezit po�et řádků chatu"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "Záznamy"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "Zapnout zaznamenávání konverzace"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Zobrazovat historii chatu"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "Zprávy"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Skrýt obchodní zprávy"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "Záložky"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Všechy šeptání jako záložky"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "Zaznamenávat zprávy o magii v debug záložce"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Zobrazovat serverové zprávy v debug záložce"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "Zapnout obchodní záložku"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "Zapnout bitevní záložku"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "Zobrazovat bitevní události"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr "Změnit velikost záložek pokud nutno"
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "ÄŒas"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "Použít místní �as"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "Ostatní"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr "Zvýrazňovaná slova (oddělená �árkou)"
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr ""
 
@@ -1983,40 +2033,40 @@ msgstr "Modrá:"
 msgid "Alpha:"
 msgstr "Průhlednost:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Použít"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Resetovat okna"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Stiskněte tla�ítko pro zahájení kalibrace"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Kalibrovat"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Zapnout joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Zastavit"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -2039,456 +2089,460 @@ msgstr "Výchozí"
 msgid "Key Conflict(s) Detected."
 msgstr "Kolize kláves detekovány."
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "Ostatní"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstra"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Zobrazit poškození způsobené monstrům"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "Automaticky zaměřovat pouze dosažitelná monstra"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Zvýraznit úto�ný dosah monster"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "Zobrazit u monster pruh s životy"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "Cyklovat zamířená monstra"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "Zvýraznit portály na mapách"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Zvýraznit věci na zemi"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Zvýraznit hrá�ův úto�ný dosah"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr "Zobrazit rozšířené minimapy"
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "Vykreslovat cestu"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr "Vykreslovat zkratky na mapÄ›"
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr "Zapnout líné rolování"
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr "Lenost rolování"
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr "Radius rolování"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "Pohyb"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "Automaticky opravovat pozici"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "Úto�it během pohybu"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "Synchronizovat hrá�ův pohyb"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "Program A šílených pohybů"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "hrá�"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Zobrazit vlastní pruh životů"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "Zapnout rychlé statistiky"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "Cyklovat zamířené hrá�e"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "Zobrazovat zprávy o pracovních exp"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "Zobrazovat popupy o hrá�ích"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr "Away zpráva"
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "Zobrazit práci"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Akceptovat požadavky na koupi/prodej"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "Zapnout mód obchodu"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "Zaznamenávat dialogy s NPC"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr "Podpora botů"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr "Zapnout podporu AuctionBot-a"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Zapnout podporu guild bota a vypnout nativní podporu gild"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Zapnout ověřova� botů"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "Zapnout debug záznam"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "Mód nízké síťvé náro�nosti"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr "Skrýt zobrazení štítu"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Zobrazit pozadí"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Lep�í výkon (zapněte pro lepší výkon)"
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr "Automatické nastavování výkonu"
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "HW akcelerace"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr "Lepší kvalita (vypněte pro lepší výkon)"
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr "Zobrazit objekty průhledné"
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Málo paměti (zapněte pro nízké využití paměti)"
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Zobrazit pohlaví"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Zobrazit úroveň"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Zobrazit vlastní jméno"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "Zaměřovat mrtvé hrá�e"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Viditelná jména"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr "Bezpe�né obchody"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr "Nebezpe�né znaky ve jménech"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr "Zobrazovat statusy"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr "Zobrazovat IP adresy ve snímcích obrazovky"
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr "Povolit lé�ení sebe sama kliknutím myši"
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Vztahy"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutrální"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Přítel"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Přehlížený"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignorovaný"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Vymazán"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Povolit obchodování"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Povolit šeptání"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Starý"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "Vztahy"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Když ignoruji:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Mrňavý (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Malý (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Střední (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Velký (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Větší (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Obrovský (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Téma"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "Téma GUI"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "Hlavní font"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Tu�ný font"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "Font �ástic"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "Pomocný font"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr "Bezpe�ný font"
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr "Japonský font"
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Velikost písma"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Téma změněno"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Restartujte klient pro aplikováni změn."
 
@@ -2504,159 +2558,165 @@ msgstr "Rychlé OpenGL"
 msgid "Safe OpenGL"
 msgstr "Bezpe�né OpenGL"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Bez textu"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Text"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Bubliny, beze jmen"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Bubliny se jmény"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "vypnout"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "nízký"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "vysoký"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "střední"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Celá obrazovka"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Vlastní kurzor"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Částicové efekty"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Zobrazit informaci o sebrání předmětu"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "v chatu"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "jako �ástici"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "Omezení FPS:"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "Altern. FPS omezení:"
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "Neprůhlednost GUI"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr ""
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "Detaily �ástic"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "Žádné"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Selhalo přepnutí do módu celé obrazovky a obnovení předchozího módu taktéž "
 "selhalo!"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Přepínám na celou obrazovku"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Pro uplatnění změn je potřeba restart."
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Měním na OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Změny v OpenGL vyžadují restart."
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Vlastní rozlišení (příklad: 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "Zadej nové rozlišení:"
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "Rozlišení obrazovky změněno"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Některá okna mohou být přesunuta aby se vešly do menšího okna."
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "Nastavení �ásticových efektů bylo změněno."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Neprůhlednost GUI"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Bez textu"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Text"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Bubliny, beze jmen"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Bubliny se jmény"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "vypnout"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "nízký"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "vysoký"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Částicové efekty"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "střední"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "Detaily �ástic"
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "Změny se projeví až po změně mapy."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2739,7 +2799,7 @@ msgid "Lvl: %d (%+d)"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Gilda"
 
@@ -2771,7 +2831,7 @@ msgstr "Opustit gildu?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Jste si jisti že chcete opustit gildu %s?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Parta"
 
@@ -2943,139 +3003,139 @@ msgstr "Zvolte jméno vaší party."
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Úroveň: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Peníze: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Práce: %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Práce:"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr "Bodů postavy: %d"
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Úroveň: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Žádný cíl"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr " "
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Obecná magie"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Magie života"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Magie války"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Magie přeměn"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Magie přírody"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "Magie hvězd"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "Editor příkazů"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "magie"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "ostatní"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Příkaz:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Typ cíle:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "Ikona:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Úroveň magie:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "Å kola magie:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "Úroveň školy:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Uložit"
 
@@ -3303,7 +3363,7 @@ msgstr "Hranice domácího místa"
 msgid "Road Point"
 msgstr "Bod cesty"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "Kdo je online - Obnovuji"
 
@@ -3311,15 +3371,15 @@ msgstr "Kdo je online - Obnovuji"
 msgid "Update"
 msgstr "Obnovit"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "Kdo je online - "
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3384,8 +3444,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Pokud <nick> obsahuje mezeru, uzavřete jej do uvozovek (\")."
 
@@ -3423,38 +3483,38 @@ msgstr "Globální oznámení od %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
@@ -3594,427 +3654,427 @@ msgstr "Úložiště"
 msgid "Cart"
 msgstr "Košík"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Pohyb nahoru"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Pohyb dolů"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Pohyb vlevo"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Pohyb vpravo"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Cíl & Útok"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "Přejít k cíli"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "Změnit typ přesunu k cíli"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr "Přejít na domácí místo"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr "Nastavit domácí místo"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Zastavit Útok"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "Zaměřit nejbližší"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Zaměřit NPC"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Zaměřit hrá�e"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Sebrat"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "Změnit typ sběru"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Skrýt okna"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Sednout si"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Zapnout/Vypnout obchody"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "Změnit mód zobrazení mapy"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "Vybrat OK"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Okno nápovědy"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Stavové okno"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Okno inventáře"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Okno vybavení"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Okno dovedností"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Okno s minimapou"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Okno s chatem"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Okno nastavení"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Debug okno"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "Okno spolešenství"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Okno zkratek smajlíků"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "Okno výstroje"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr "Okno s obchodem"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "Okno \"Kdo je online\""
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "Okno \"Víte že...\""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr "Předchozí záložka spole�enství"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr "Další záložka spole�enství"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Smajlíky"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Zkratka smajlíku %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "Obléct výstroj"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr "Kopírovat výstroj"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr "Kopírovat výbavu do výstroje"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Přepnout chat"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Rolovat chat nahoru"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Rolovat chat dolů"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Předchozí záložka chatu"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Další záložka chatu"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr "Zavřít stávající záložku chatu"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr "Předchozí řádek chatu"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr "Další řádek chatu"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr "Autodoplňování v chatu"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr "Deaktivovat vstup chatu"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ignorovat vstup 1"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ignorovat vstup 2"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr "Oto�it nahoru"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr "Oto�it dolů"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr "Oto�it vlevo"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr "Oto�it vpravo"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr "Šílené pohyby"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr "Změnit mód šílených pohybů"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "Rychlé lé�ení cíle nebo sebe"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr "Použít kouzlo #itenplz"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "Použít magický útok"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr "Přepnout magický útok"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr "Změnit typ pohybu"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr "Změnit typ úto�né zbraně"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr "Změnit typ útoku"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr "Změnit mód následování"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr "Změnit mód imitace"
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "Zapnout/Vypnout audio"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "Zapnout/Vypnout Away mód"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr "Emulovat pravý klik z klávesnice"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr "přemnout mód kamery"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr "Klávesa modifikátoru"
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4023,42 +4083,42 @@ msgstr ""
 "Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřešte jej, neboť se hra může "
 "chovat podivnÄ›."
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4066,398 +4126,396 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:1719
-#, fuzzy
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
-msgstr "Exp:"
+msgstr ""
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
-#, fuzzy
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
-msgstr "pruh práce"
+msgstr ""
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) výchozí pohyby"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr "(I) invertované pohyby"
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr "(c) pohyby s trochou šílených pohybů"
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr "(C) pohyby s šílenými pohyby"
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) dvojité normální + šílené"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr "(a) vlastní šílené pohyby"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr "(?) šílené pohyby"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr "(0) výchozí pohyb k cíli"
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr "(1) pohyb k cíli do vzdálenosti 1"
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr "(2) pohyb k cíli do vzdálenosti 2"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr "(3) pohyb k cíli do vzdálenosti 3"
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr "(5) pohyb k cíli do vzdálenosti 5"
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr "(7) pohyb k cíli do vzdálenosti 7"
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr "(A) pohyb k cíli na úto�ný dosah"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?) pohyb k cíli"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr "(D) výchozí následování"
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr "(R) relativní následování"
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr "(M) zrcadlené následování"
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr "(?) neznámé následování"
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) útok"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) výchozí útok"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr "(s) přepínat útok bez štítu"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr "(S) přepínat útok se štítem"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) jdi a úto�"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) jdi, úto�, sbírej"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) bez automatického útoku"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) malý sběr 1x1 pole"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) výchozí sběr 2x1 pole"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) sběr před 2x3 pole"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) sběr 3x3 pole"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) jdi a seber do vzdálenosti 4"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) jdi a seber do vzdálenosti 8"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr "(A) jdi a seber do max. vzdálenosti"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?) sběr"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) Normální zobrazení mapy"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr "(D) debug zobrazení mapy"
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr "(u) ultra zobrazení mapy"
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra zobrazení mapy 2"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) zobrazen prázdné mapy"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b) zobrazení �ernobílé mapy"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) použij #flar pro magický útok"
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) použij #chiza pro magický útok"
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) použij #ingrav pro magický útok"
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) použij #frillyar pro magický útok"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) použij #upmarmu pro magický útok"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) magický útok attack"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr "(D) výchozí imitace"
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr "(O) imitace výstroje"
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr "(?) imitace"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) u po�íta�e"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) pry� (away)"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) away"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr "(G) mód herní kamery"
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr "(F) mód volné kamery"
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr "Modifikátory hry jsou zapnuty"
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr "Modifikátory hry jsou vypnuty"
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr "Vidíte "
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Nastavení:"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4696,107 +4754,107 @@ msgstr ""
 msgid "%s has kicked from your guild."
 msgstr "%s byl vykopnut z vaší gildy."
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "Sdílení předmětů povoleno."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "Sdílení předmětů zakázáno."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "Sdílení předmětů není možné."
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr "Stav sdílení předmětů neznámý."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "Sdílení zkušeností povoleno."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "Sdílení zkušeností zakázáno."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr "Sdílení zkušeností není možné."
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr "Stav sdílení zkušeností neznámý."
 
@@ -4871,83 +4929,83 @@ msgstr "Toto uživatelské jméno je již používáno."
 msgid "Username permanently erased."
 msgstr "Uživatelské jméno bylo trvale odstraněno."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Nelze vytvořit partu."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "Parta úspěšně vytvořena."
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s se připojil k vaší partě."
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s je již �lenem vaší party."
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s zamítl vaši pozvánku."
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s je nyní �len vaší party."
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s nemůže být �lenem party, jelikož je parta plná."
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "Odešel jste z party."
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s opustil vaši partu."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Neznámý �len se snažil říct: %s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Jste mrtev."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "S lítostí vám oznamujeme, že vaše postava byla zabita v bitvě."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Nejste již více naživu."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Chladné ruce smrti se natahují po vaší duši."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Konec hry!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "Vložte minci pro pokra�ování."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4955,80 +5013,80 @@ msgstr ""
 "Ne, děti. Vaše postava ve skute�nosti neumřela. Ona.. errm.. odešla na lepší "
 "místo."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "Váš plán zni�it nepříteli zbraň pomocí úderů vlastním krkem selhal."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Tuším že to nešlo tak hladce."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Chcete zaevidovat váš majetek?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Žel, nezbyla po vás ani stopa..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Zni�en."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Vypadá to, že vám někdo podává vaši hlavu."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 "Zase jste to podělal. Spláchněte vaše tělo do záchodu a najdete si nějaké "
 "jiné."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "Ještě nejste mrtev. Zatím jen odpo�íváte."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr "Již nejste."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr "Bylo vám odepřeno být."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr "Expiroval jste a šel jste navštívit svého tvůrce."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr "Jste tuhý."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr "Jste zbaven života, odpo�ívejte v pokoji."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Kdybyste nebyl tak animovaný, �uchal by jste ke květinkám zespoda."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr "vaše metabolické procesy jsou nyní historií."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr "Padl jste."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr "A je to v kýblu."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5036,25 +5094,25 @@ msgstr ""
 "Vaše trápení je u konce, opona je stažená a vy jste se připojil k vašemu "
 "neviditelnému sboru."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr "nyní jste bývalý hrá�."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "Zpráva"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Nesete více než polovinu vaší váhy. Obnovování života nyní není možné."
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Nesete méně než polovinu vaší váhy. Obnovování života je nyní možné."
 
@@ -5638,24 +5696,24 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 295aa8ab6..7a88a613f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,356 +2,381 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
-# GonzoDark <Gonzo.Dark@gmail.com>, 2011.
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
+# GonzoDark <Gonzo.Dark@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Danish (http://www.transifex.net/projects/p/manaplus/team/da/)\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/manaplus/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Opsætning"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr "Video"
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Forbinder til server"
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Logger ind"
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fejl"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Ukendt kommando"
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "du kan ikke sende en hviskebesked uden tekst!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Du glemte at skrive et navn på dit party."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Retur bringer focus på chatten."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Besked lukker chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Enter bringer nu focus på chatten."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Besked lukker nu chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Gemningen af skærmbilledet fejlede!"
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Netværksfejl"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerer indkomne handels anmodninger"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Accepterer indkomne handels anmodninger"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunne ikke loade %s."
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -360,23 +385,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Navn"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Angrib"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Snak"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -384,79 +410,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Nulstil"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Køb"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Total: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Maks"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "butik"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Sælg"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Fortryd"
 
@@ -492,7 +522,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Adgangskode:"
@@ -519,81 +549,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "Lav en ny karakter."
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Navn:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Opret"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Mand"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Kvinde"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Du mangler at fordele %d points"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dit navn skal være mindst 4 bogstaver langt."
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Du har brugt alle dine points"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Du skal fjerne %d points"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "Bekræft sletning af karakter"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakter?"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "Ret konto og karakter"
 
@@ -601,120 +636,122 @@ msgstr "Ret konto og karakter"
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Frameld"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Slet"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Hvisker til %s: %s"
@@ -727,508 +764,553 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Kort"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Luk"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Udstyr"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Tag af"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Hjælp"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
-msgstr "Inventarliste"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr "Inventarliste"
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Tag på"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Brug"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Opdel"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "Vægt:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Gem på lager"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Hent fra lager"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Smid"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Vælg hvor mange genstande du vil bytte."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Vælg hvor mange genstande du vil smide."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Vælg hvor mange genstande du vil lagre"
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Vælg hvor mange genstande du vil opdele."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Log Ind"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Venter på serveren"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Næste"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Send forespørgsel"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Til:"
@@ -1241,345 +1323,382 @@ msgstr "Send"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kunne ikke sende brevet. Afsender eller brev er ugyldigt."
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handl"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "Brugere"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Skift server"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Skift karakter"
 
@@ -1623,200 +1742,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Tilføj"
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
-msgstr "Skriv både adressen og porten på serveren."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Lyd"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Lyd"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Lydstyrke på effekter"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Lydstyrke på musik"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Farver"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Placer alle hviskesamtaler i en tab"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "SÃ¥dan ser farven ud."
@@ -1864,41 +2022,41 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Anvend"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Nulstil Vinduer"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Tryk på knappen for at starte justeringen."
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Justering"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Aktiver joystick"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Rotere joysticket"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1920,360 +2078,460 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr "Tast Konfikt(er) Opdaget."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstre"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "Brugere"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Synlige navne"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Ven"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Se bort fra"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignorer"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Tillad handel"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Tillad hviskere"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "NÃ¥r ignorer:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
@@ -2289,408 +2547,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Ingen tekst"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Tekst"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Bobler uden navne"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Bobler med navne"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "deaktiveret"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "lav"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "høj"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "mellem"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "maks"
-
-#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Fuld Skærm"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Brugerdefineret cursor"
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
-msgstr "Partikeleffekter"
-
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
-msgstr "Vis besked når noget samles op"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
-msgstr "i chat"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
-msgstr "som partikeleffekt"
-
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Video"
-
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
-msgstr "Gennemsigtighed"
-
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr "Omgivende FX"
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Ændringerne kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Gennemsigtighed"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Ingen tekst"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Tekst"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Bobler uden navne"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Bobler med navne"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "deaktiveret"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "lav"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "høj"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Omgivende FX"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Partikeleffekter"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "mellem"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "maks"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-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/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr "Tilføj"
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Anmodning om byttehandel."
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Færdigheder"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr "Op"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Opret en guild"
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har inviteret med i sin gruppe"
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har inviteret med i %s's gruppe."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Accepter invitationen"
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2698,504 +2989,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Penge: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
-msgstr ""
-"Copy text   \t\r\n"
-"Job: %d"
+msgstr "Copy text   \t\r\nJob: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3219,62 +3145,60 @@ msgstr "Godkendt. Venter..."
 msgid "Trade: You"
 msgstr "Handel: Dig"
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr "Du giver:"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "Ændre"
 
-#: src/gui/tradewindow.cpp:332
-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/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:375
 msgid "You don't have enough money."
 msgstr "Du har ikke penge nok."
 
+#: src/gui/tradewindow.cpp:454
+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/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Navn: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Updatere..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Opretter forbindelse..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Spil"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  Opdateringsprocessen er ikke færdiggjort"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det er varmt anbefalet at"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Udført"
 
@@ -3426,23 +3350,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3507,17 +3431,14 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Denne kommando gør <navn> til operator"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Hvis <spilller>  (altså spillerens navn) indeholder mellemrum, så kan du "
-"sætter gåseøjne (\")."
+msgstr "Hvis <spilller>  (altså spillerens navn) indeholder mellemrum, så kan du sætter gåseøjne (\")."
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
-msgstr ""
-"En operator kan gøre andre brugere til operators eller sparke dem ud af "
-"kanalen."
+msgstr "En operator kan gøre andre brugere til operators eller sparke dem ud af kanalen."
 
 #: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
@@ -3533,8 +3454,7 @@ msgstr "Du glemte at skrive navnet på den bruger der skal blive operator"
 
 #: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
-msgstr ""
-"Du glemte at skrive navnet på den bruger der skal sparkes ud af kanalen"
+msgstr "Du glemte at skrive navnet på den bruger der skal sparkes ud af kanalen"
 
 #: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
@@ -3550,6 +3470,41 @@ msgstr "Besked fra %s til alle:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3679,557 +3634,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Flyt op"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Flyt ned"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Flyt til venstre"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Flyt til højre"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Vælg modstander og angrib"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Smiley"
-
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Stop angreb"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Vælg NPC som ny modstander"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Vælg spiller som ny modstander"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Saml op"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Gem vinduer"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Sid"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Gem skærmbillede som fil"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Slå handler fra/til"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr "Vælg OK"
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Shortcut %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Hjælpevindue"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Statsvindue"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Færdigheds-vindue"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Minikort"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Chat-vindue"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Opsætnings-vindue"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Debug-vindue"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr "Smiley"
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Slå chat til eller fra"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Scroll chat op"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Scroll chat ned"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "GÃ¥ til sidste chat tab"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Gå til næste chat tab"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Vælg OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Indstillinger:"
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4245,142 +4516,130 @@ msgstr "Tak for købet."
 msgid "Unable to buy."
 msgstr "Du kan ikke købe."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4414,422 +4673,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Du er død."
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 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."
+msgstr "Vi beklager at måtte informere dig, om at din karakter var dræbt i kamp."
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Du er ikke så levende som du engang har været."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 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/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 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."
+msgstr "Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre sted."
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 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."
+msgstr "Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Jeg går ud fra at dette ikke gik alt for godt."
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Du vil gerne have dine ejendele identificeret?"
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Desværre, blev der aldrig fundet noget spor efter dig..."
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Udslettet."
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 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/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4843,160 +5094,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vil gerne handle med dig. Accepterer du?"
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "Handel annulleret."
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "Handel er komplet."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Styrke"
 
@@ -5005,7 +5256,7 @@ msgstr "Styrke"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Adræthed"
 
@@ -5014,7 +5265,7 @@ msgstr "Adræthed"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Behændighed"
 
@@ -5023,7 +5274,7 @@ msgstr "Behændighed"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Helbred"
 
@@ -5032,7 +5283,7 @@ msgstr "Helbred"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Intelligens"
 
@@ -5302,41 +5553,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr "Styrke %+d"
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr "Adræthed %+d"
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr "Helbred %+d"
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligens %+d"
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Behændighed %+d"
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr "Held %+d"
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5344,129 +5595,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr "Blev smidt af serveren!"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Held"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s er ikke medlem af din gruppe!"
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "unavngivet"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Angreb %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Forsvar %+d"
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Ukendt genstand"
-
-
diff --git a/po/de.po b/po/de.po
index 40a2199df..4919d0751 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,10 +14,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-05 23:09+0000\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
+"Language-Team: German (http://www.transifex.net/projects/p/manaplus/language/"
 "de/)\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -25,69 +25,73 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "Sichtbar au der Karte"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "ausweichen"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Leistung"
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr "Themen"
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Anmelden"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Spielfiguren werden angefragt"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Charakterserver"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Charakterserver wechseln"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -97,64 +101,64 @@ msgstr "Charakterserver wechseln"
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Passwort ändern"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ungültiger Updateserver: %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 "Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Unbekannter Befehl."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -163,160 +167,160 @@ msgstr ""
 "Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
 "oder du bist es selbst."
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Anfrage den Kanal %s betreten zu dürfen."
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Name der Party fehlt."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "Name der Gilde fehlt."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)"
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Nachricht schließt den Chat."
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Enter aktiviert jetzt den Chat."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Nachricht schließt jetzt den Chat."
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "Freund"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "unbeachtet"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "Spieler ist bereits %s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spieler erfolgreich %s!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spieler konnte nicht %s werden!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr "Feind"
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "Spieler ist bereits gelöscht!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "Spieler erfolgreich gelöscht!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "Spieler konnte nicht gelöscht werden!"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "Schrift-Cache Größe"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr "Cache-Größe:"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "Erstellt:"
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "Gelöscht:"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -326,11 +330,11 @@ 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/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Allgemein"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "Debug"
 
@@ -391,18 +395,18 @@ msgstr "Kommentar: %s"
 msgid "Bot Checker"
 msgstr "Bot-Prüfer"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Name"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Angriff"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Sprechen"
 
@@ -440,7 +444,7 @@ msgstr "Menge"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -448,25 +452,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Beenden"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Laden"
 
@@ -490,8 +494,8 @@ msgstr "Verkaufen"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -664,8 +668,8 @@ msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Löschen"
 
@@ -683,6 +687,7 @@ msgid "(empty)"
 msgstr "(leer)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "Standard"
 
@@ -740,24 +745,23 @@ msgstr "Regenbogen 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüsternd zu %s: %s"
@@ -781,7 +785,7 @@ msgid "Ignore"
 msgstr "ignorieren"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Karte"
 
@@ -856,62 +860,76 @@ msgstr "Texturanzahl:"
 msgid "Particle count: %d"
 msgstr "Partikelzählung: %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Ziel:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "Ziel ID:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
-msgstr "Ziel level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
-msgstr "Ziel Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
-msgstr "Ziel Gilde:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "Attackier-Verzögerung:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr "Minimaler Treffer"
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr "Maximaler Treffer"
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr "Kritischer Treffer"
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Ziel level:"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Ziel Party:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Ziel Gilde:"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Eingehend: %d bytes/s"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Ausgehend: %d bytes/s"
@@ -938,8 +956,8 @@ msgstr "Vor >"
 msgid "Auto open this window"
 msgstr "Öffne dieses Fenster automatisch"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
@@ -1051,7 +1069,7 @@ msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Aufbewahren"
 
@@ -1110,91 +1128,91 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Besiegte Gegner Statistik"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "Statistik zurücksetzen"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "Timer zurücksetzen"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Level: %d bei %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d/%d Ãœbrig: %d"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Kills/Min: %s, Exp/Min: %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "Letze exp:"
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "Zeit bis zum nächsten Level: %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
@@ -1295,13 +1313,13 @@ msgid "Submit"
 msgstr "Absenden"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
 #: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
-msgstr "Frei"
+msgstr "Leeren"
 
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
@@ -1405,7 +1423,7 @@ msgstr "Nicht mehr Ignorieren"
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "@@ignore|Ignoriere %s komplett@@"
 
@@ -1501,7 +1519,7 @@ msgstr "Hinzufügen zur Ignorierenliste"
 msgid "Add name to chat"
 msgstr "Füge Name dem Chat hinzu"
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Spieler"
 
@@ -1668,12 +1686,12 @@ msgstr "Zeigen"
 msgid "Reset yellow bar"
 msgstr "Setze gelben Balken zurück"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Kopiere zu Chat"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(normal)"
@@ -1751,25 +1769,25 @@ msgstr "Verbinde..."
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Ändern"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "Fehler beim Empfangen der Serverliste!"
 
@@ -1782,157 +1800,188 @@ msgstr "benötigt eine neuere Version"
 msgid "requires v%s"
 msgstr "benötigt v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Audio einschalten"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "Musik einschalten"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "Spieltöne einschalten"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "Nachrichtentöne einschalten"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "Musik einschalten"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "\"mumble voice chat\" einschalten"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "Lade Musik herunter"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Audio"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Lautstärke der Klangeffekte"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Lautstärke der Musik"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Bemerkung"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
-"Der Client muss neugestartet werden, wenn die neue Musik heruntergeladen "
-"werden soll"
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Soundengine"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "Sonstig"
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "\"mumble voice chat\" einschalten"
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "Lade Musik herunter"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Farben"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Farben bei eingehenden Nachrichten abschalten"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Zeige Chatfarben-Liste"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "Befehle"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Lasse magische und GM-Nachrichten in allen Chat Tabs zu"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "Limit"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Limitiere max Zeichen in Chatzeile"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Limitiere max Zeilen im Chat"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "Logs"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "Aufzeichnen des Chats einschalten"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Zeige Chat-Historie"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Verstecke Laden-Mitteilungen"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "Tabs"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Alle privaten Nachrichten in Tabs öffnen"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "Aufzeichnen der magischen Nachrichten im \"Debug Tab\""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Zeige Servermitteilungen im \"Debug Tab\""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "Handel-Tab einschalten"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "Kampf-Tab einschalten"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "Zeige Kampf-Ereignisse"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr "Größe der Chat-Tabs anpassen"
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "Zeit"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "Benutze lokale Zeit"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "Sonstig"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr "Wörter hervorheben (welche mit Komma getrennt sind)"
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr ""
 
@@ -1983,41 +2032,41 @@ msgstr "Blau: "
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Anwenden"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Knopf drücken um die Kalibrierung zu starten"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Kalibrieren"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Joystick aktivieren"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
-msgstr "Drehe den Controlstick und drücke keine Tasten"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2039,456 +2088,460 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr "Wiedersprüchliche Tasteneinstellung(en) entdeckt"
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "Sonstiges"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Zeige zugefügten Schaden bei Monstern"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "Nur erreichbare Monster automatisch anvisieren"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Angriffsbereich vom Monstern anzeigen"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "HP-Balken von Monster anzeigen"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "Durch die Angriffsziele wechseln"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr "Zeige Warp Partikel"
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "Karten Ein- und Ausgänge hervorheben"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Gegenstände auf dem Boden hervorheben"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Angriffsbereich des Spielers hervorheben"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr "Zeige erweiterte Minikarte"
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "Zeige Pfad"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr "Zeige Hotekeys auf der Karte"
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr ""
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "Bewegt sich"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "Automatischen Berichtigen der Position"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "Während des Bewegens angreifen"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "Synchronisiere Bewegungen des Spielers"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "Verrückte Bewegungen A-Programm"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "Spieler"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Eigenen HP-Balken anzeigen"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "Aktiviere schnelleres Aufwerten der Spelerattribute"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "Angriffsziele des Spielers einkreisen"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "Zeige \"job exp\"-Nachrichten"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "Zeige Spieler-Popups"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr "Abwesend Nachricht"
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "Zeige Job"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr "Aktiviere Attackenfilter"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Verkauf- und Kaufanfragen akzeptieren"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "Laden-Modus einschalten"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "Protokolliere NPC Dialoge"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr "Bot unterstützung"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr "Aktiviere auction bot unterstützung"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Erlaube Gilden-Bot und deaktiviere nativen Gilden-Support"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr "Aktiviere Angriff trotz Verzögerung"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Botprüfer einschalten"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "Debug-Protokoll benutzen"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "Niedriger Datenverkehr Modus"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr "Zeige das Schild nicht an"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Zeige Hintergrund"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Bessere Leistung (aktiviere für bessere Leistung)"
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr "Performance autom. anpassen"
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "Hw Beschleunigung"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr "Bessere Qualität (deaktiviere für bessere Leistung)"
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr "Zeige die Transperenz von Entitäten"
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Geschlecht anzeigen"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Level anzeigen"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Eigenen Namen anzeigen"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "Anvisieren toter Spieler"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Sichtbare Namen"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr "Zeige Stattistiken"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr "IP auf Screenshots anzeigen."
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr "Erlaube Selbstheilung mittels Mausklick"
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Beziehung"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Freund"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Unbeachtet"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignoriert"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Gelöscht"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr "Feind"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Handeln erlauben"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Flüstern erlauben"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Alt"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "Beziehungen"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Wenn ignorierend:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Winzig"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Klein"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Mittel"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Groß"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Sehr groß"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Riesig"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr "Chinesisch(China)"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr "Englisch"
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr "Französisch"
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr "Deutsch"
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr "Indonesisch"
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr "Polnisch"
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr "Portugiesisch(Brasilien)"
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr "Russisch"
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Theme"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "GUI Theme"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr "Sprache"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "Hauptschriftart"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Dicke Schrift"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "Schrift von Spieleraktionen"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "Hilfe Schriftart"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr "Japanische Schrift"
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Schriftgröße"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Theme geändert"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
 
@@ -2504,164 +2557,170 @@ msgstr "Schnelles OpenGL"
 msgid "Safe OpenGL"
 msgstr "Sicheres OpenGL"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Kein Text"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Text"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Blasen, keine Namen"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Blasen mit Namen"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "Aus"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "Niedrig"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "Hoch"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "Mittel"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Vollbild"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Partikeleffekte"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Benachrichtigung beim Aufheben"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "im Chatfenster"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "als Partikeleffekt"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr "Erlaube Größenanpassung"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr "Kein Fensterrahmen"
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "FPS Limit:"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "Alt FPS Limit:"
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr "Chat über Spielern"
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "GUI Transparenz"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "Hintergrundeffekte"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "Partikeldetail"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "Kein(e)"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Das Wechseln in den Fenstermodus sowie das Wiederherstellen der vorherigen "
 "Auflösung schlug fehl."
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Das Wechseln in den Vollbildmodus sowie das Wiederherstellen der vorherigen "
 "Auflösung schlug fehl."
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Wechsle zum Vollbildmodus"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Wechsle zu OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Benutzerdefinierte Auflösung (zum Beispiel: 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "Neue Auflösung eingeben:"
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "Bildschirmauflösung wurde geändert"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 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/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "Partikeleffekteinstellungen wurden verändert"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "GUI Transparenz"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Kein Text"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Text"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Blasen, keine Namen"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Blasen mit Namen"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Chat über Spielern"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "Aus"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "Niedrig"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "Hoch"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Hintergrundeffekte"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Partikeleffekte"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "Mittel"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "Partikeldetail"
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2744,7 +2803,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "Lvl: %d (%+d)"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Gilde"
 
@@ -2776,7 +2835,7 @@ msgstr "Guilde verlassen?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bist du sicher, dass du die Gilde %s verlassen willst?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Party"
 
@@ -2948,139 +3007,139 @@ msgstr "Name deiner Party wählen."
 msgid "Specials"
 msgstr "Special"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Stufe: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr "Charakterpunkte: %d"
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Level: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr "Korrekturpunkte: %d"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Kein Ziel"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "Ziel erlauben"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "Brauche Ziel"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Generelle Magie"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Lebensmagie"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Kriegsmagie"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Verwandlungsmagie"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Naturmagie"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "Astralmagie"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "Kommando Editor"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "magisch"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "andere"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "Symbol:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Befehl:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Art des Anvisierens:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "Icon:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Magielevel:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "Magieschule:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "Schul-Level"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Speichern"
 
@@ -3310,7 +3369,7 @@ msgstr "Stamm platz Grenze"
 msgid "Road Point"
 msgstr "Wegpunkt"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "Wer ist Online - Aktualisiere"
 
@@ -3318,15 +3377,15 @@ msgstr "Wer ist Online - Aktualisiere"
 msgid "Update"
 msgstr "Aktualisierung"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "Wer ist Online -"
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "Wer ist Online - Fehler"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Wer ist Online - Aktualisiere"
 
@@ -3391,8 +3450,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Dieser Befehl macht Spieler <Name> zu einem Moderator des Kanals"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 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 "
@@ -3434,38 +3493,38 @@ msgstr "Globale Ansage von %s:"
 msgid "%s whispers: %s"
 msgstr "%s flüstert: %s"
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr "Befehl:/invite<nick>"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Dieser Befehl lädt <nick> in deine Gilde ein."
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr "Befehl:/leave"
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr "Dieser Kommando wirft einen Spieler aus der Gilde."
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr "/help > zeige diese Hilfe."
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Lade einen Spieler in deine Party ein"
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Verlasse dir Gilde in der du bist"
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Jemanden aus deiner Gilde werfen"
 
@@ -3608,427 +3667,427 @@ msgstr "Lager"
 msgid "Cart"
 msgstr "Einkaufswagen"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr "Normale Tasten"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Laufe Hoch"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Laufe Runter"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Laufe nach Links"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Laufe nach Rechts"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Zielen & Angreifen"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "Gehe zu Ziel"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "Verändere Bewege dich zum Ziel-Typus"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr "Gehe zu Stammplatz"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr "Setzte Stammplatz"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr "Bewege zum Navigationspunkt"
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Angriff abbrechen"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr "Deselektieren"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "Markiere Nähesten"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "NPC anvisieren"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Spieler anvisieren"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Aufheben"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "Verändere den Aufnahme-Typ"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Fenster ausblenden"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Sitzen"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Handeln erlauben/verbieten"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "Wechsle Ansichtsmodus der Karte"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "OK auswählen"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr "Tastenkürzel"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr "Item-Tastenkürzel"
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Kurztaste %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr "Fenster Tasten"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Hilfefenster"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Statusfenster"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Inventarfenster"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Ausrüstungsfenster"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Fertigkeitenfenster"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Kartenfenster"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Chatfenster"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Kurztastenfenster"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Einstellungen"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Debugfenster"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "Gesellschaftsfenster"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Kurztasten für Gefühle"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "Kleidungs Fenster"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr "Kauf Fenster"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr "Schnelles wegwerfen Fenster"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr "Besiegte Gegner Fenster"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr "Befehls Fenster"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr "Bot Prüfer Fenster"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "Wer ist Online Fenster"
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "Wusstest du schon Fenster"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr "Vorheriger Gesellschaftstab"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr "Nächster Gesellschaftstab"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr "Emotons Tasten"
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Grinsen"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Gefühlstaste %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr "Outfit Tasten"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "Ausrüstung anziehen"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr "Ausrüstung kopieren"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr "Chat Tasten"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Chat ein/aus"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Im Chat hochscrollen"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Im Chat runter scrollen"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Nächster Tab"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr "Schließe aktuellen Tab"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr "Vorherige Chat-Zeile"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr "Nächste Chat-Zeile"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr "Chat Autovervollständigung"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr "Deaktiviere Chateingabe"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr "Andere Tasten"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ignoriere Eingabe 1"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ignoriere Eingabe 2"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr "Richtung oben"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr "Richtung unten"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr "Richtung links"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr "Richtung rechts"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr "Verrückte Bewegungen"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr "Verändere den verrückte Bewegungen-Modus"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Lass N Items von Slot 0 fallen"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr "Lass N Items fallen"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "Heile Ziel/dich selbst"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr "Benutze #itenplz Spruch"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "Benutze magische Angriff"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr "Wechsle magische Angriff"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr "Wechsle PVP Attacke"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr "Wechsle die Bewegungsart"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr "Verändere die Angriffswaffe"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr "Wechsle Angriffsart"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr "Wechle Folgenmodus"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr "Wechsle Imitierenmodus"
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr "Aktiviere / Deaktiviere Spielmodifikations Tasten"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "An/Aus Audio"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "Aktiviere/Deaktiviere abwesend Modus"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr "Emuliere Rechts-Klick mit der Tastatur"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr "Ändere Kameramodus"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4037,438 +4096,438 @@ msgstr ""
 "Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder "
 "das Spiel lässt sich nicht richtig steuern."
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Du wurdest von einem %s getötet"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "Du versucht einen nicht exitierenden Gegenstand aufzuheben."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "Gegenstand ist zu schwer"
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "Gegenstand ist zu weit weg."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "Inventar ist voll"
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr "Stapel ist zu groß"
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "Gegenstand gehört jemand anderem"
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr "Fehler bei dem Aufheben des Items."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Du hast %d [@@%d|%s@@] aufgehoben."
 msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) normale Bewegungen"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr "(I) bewegungen umkehren"
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegt sich etwas verrückt"
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegt sich verrückt"
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) normal + verrückt Bewegen"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr "(?) unbekannte Bewegung"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr "(a) benutzerdefinierte verrückte Bewegung"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr "(?) verrückte Bewegung"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr "(0) bewegt sich normal zum Ziel"
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr "(0) bewegt sich zum Ziel in Distanz 1"
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegt sich zum Ziel in Distanz 2"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegt sich zum Ziel in Distanz 3"
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegt sich zum Ziel in Distanz 5"
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegt sich zum Ziel in Distanz 7"
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr "(A) bewegt sich zum Ziel in Reichweite"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr "(a) Bogenschützen Angriffsreichweite"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?) bewegt sich zu jedem Ziel"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr "(D) normales Folgen"
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr "(R) relatives Folgen"
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeltes Folgen"
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr "(P) hinterher Folgen"
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr "(?) unbekannter Folge-Modus"
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) Angriff"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) Normaler Angriff"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr "(s) wechsel das Attackenlayout ohne Schild"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr "(S) wechsel das Attackenlayout mit Schild"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) gehe und greife an"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) gehe, greife an, hebe auf"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) ohne automatischen Angriff"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) kleine aufhebe Zelle 1x1"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) normale aufhebe Zelle 2x1"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 2x3 Kästchen nach vorne aufheben"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3 Kästchen aufheben"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) bis Distanz 4 gehen und aufheben"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) bis Distanz 8 gehen und aufheben"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr "(A) bis zur maximalen Distanz aufheben"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?) aufheben"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) Normale Kartenansicht"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr "(D) Debug Kartenansicht"
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr "(u) Ultra Kartenansicht"
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr "(U) Ultra Kartenansicht 2"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) Leere Kartenansicht"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b) Schwarz-Weiß Kartenansicht"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) benutze #flar als magischen Angriff"
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) benutze #chiza als magischen Angriff"
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) benutze #ingrav als magischen Angriff"
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) benutze #frillyar als magischen Angriff"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) benutze #upmarmu als magischen Angriff"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) magischer Angriff"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr "(a) greife alle Spieler an"
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr "(b) greife schlechte Beziehungen an"
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
-msgstr "(d) greife keine Spieler an"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr "(?) PVP Attacke"
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr "(D) normale Imitation"
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr "(O) Outfit Imitation"
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) Anwesend"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) Abwesend"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) Abwesend"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr "(G) spielerverfolgende Kamera"
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr "(F) freie Kamera"
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr "Spielmodifikatoren sind aktiviert"
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr "Spielmodifikatoren sind deaktiviert"
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "Folgen:"
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "Folgen abgebrochen"
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "Imitation abgebrochen"
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr "Du siehst"
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Optionen:"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr "-l --log-file : Log Datei benutzen"
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Verzeichnis für die Chat Log"
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Die Version des Spieles anzeigen"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr "  - --help : Zeigt diesen Hilfstext an"
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : zu benutzendes Einstellungsverueichniss"
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Mit angegebenem Benutzernamen anmelden"
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Angegebenes Passwort benutzen"
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --charakter : Mit angegebenem Spieler anmelden"
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Name oder IP-Adresse des Loginservers"
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port des Loginservers"
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Benutzt diesen Aktualisierungs Host"
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default : Wähle zuletzt benutzten Server und Spieler aus"
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Ãœberspringe das Herunterladen von Updates"
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Verzeichnis um Bildschirmfotos zu speichern"
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr "--safemode : Starte das Spiel im sicheren Modus"
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "--no-opengl : Deaktiviere OpenGL für diese Sitzung"
 
@@ -4708,43 +4767,43 @@ msgstr "Du wurdest aus der Gilde rausgeworfen"
 msgid "%s has kicked from your guild."
 msgstr "%s wurde aus Ihrer Gilde geworfen."
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr "/invite Lade einen Spieler in deine Party ein"
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > verlasse die Party in der du bist"
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > werfen jemanden aus deiner Gilde raus"
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Zeige/ändere Party Item Einstellungen"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Zeige/ändere Party EP Einstellungen"
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr "Dieser Kommando läd <nick> in deine Party ein."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr "Dieser Kommando wirft einen Spieler aus der Party."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr "Befehl: /item <Regel>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr "Dieser Kommando ändert die Item Einstellungen"
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4752,23 +4811,23 @@ msgstr ""
 "<policy> kann \"1\", \"yes\", \"true\" zum aktivieren von Item-Sharing, oder "
 "\"0\", \"no\", \"false\" sein, um es zu deaktivieren."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr "Befehl: /item"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr "Dieser Kommando zeigt die derzeitigen Item Einstellungen der Party."
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr "Kommando: /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr "Dieser Kommando verändert die EP Einstellungen der Party."
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -4776,43 +4835,43 @@ msgstr ""
 "<policy> kann \"1\", \"yes\", \"true\" zum aktivieren von EP-Sharing, oder "
 "\"0\", \"no\", \"false\" sein, um es zu deaktivieren."
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr "Befehl:/exp"
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Dieser Kommando zeigt die derzeitigen EP Einstellungen."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "Item-Sharing aktiviert."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "Item-Sharing deaktiviert."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "Item-Sharing ist nicht möglich."
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr "Item-Sharing unbekannt."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "Erfahrung teilen ist aktiviert."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "Erfahrung teilen ist deaktiviert."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr "Erfahrung teilen nicht möglich."
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr "Erfahrung teilen unbekannt."
 
@@ -4889,84 +4948,84 @@ msgstr "Dieser Benutzername ist bereits in Verwendung"
 msgid "Username permanently erased."
 msgstr "Benutzername für Immer gelöscht."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Konnte Party nicht erstellen."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "Party erfolgreich erstellt."
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s ist deiner Party beigetreten."
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s is bereits ein Mitglied deiner Party."
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s hat die Einladung abgelehnt."
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s ist nun ein Mitglied deiner Party"
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s kann deiner Party nicht beitreten. Sie ist voll."
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ Unbekannte Antwort auf die Einladung für %s."
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "Du hast die Party verlassen"
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s hat deine Party verlassen"
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Ein unbekanntes Mitglied hat versucht zu sagen: %s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Ach ja: Du bist Tot."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 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/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Du bist nicht länger lebendig."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 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/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "Werfe eine Münze ein um Weiterzuspielen."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4974,7 +5033,7 @@ msgstr ""
 "Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
 "besserem Ort gegangen."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4982,104 +5041,104 @@ msgstr ""
 "Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
 "nicht ganz so genial, wie Du dachtest..."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Ich glaube, das war nicht so gut."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Vernichtet."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "Du bist nicht Tod, du ruhst dich nur aus."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr "Du bit tot."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr "Du bist nicht mehr..."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr "Deine Zeit ist abgelaufen. Zeit deinem Schöpfer gegenüberzutreten."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr "Du bist eine Leiche."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr "Deines Lebens beraubt, ruhst du in Frieden."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 "Wenn sie nicht so unvorsichtig gewesen währen, könnten sie die Radischen "
 "noch von oben sehen."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr "Deine metabolischen Prozesse sind nun Geschichte."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr "Du bist weg vom Fenster."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 "Du schaust dir die Gänseblümchen\n"
 "gerade von unten an."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "\"Ãœbung macht den Meister\", meint das Monster."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr "Du bist ein Ex-Spieler"
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr "Du schmachst an den Fjorden"
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Du trägst mehr als die Hälfte die du tragen kannst. Du kannst nun deine "
 "Gesundheit nicht mehr regenerieren."
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Du trägst weniger als die hälfte des Gewichts. Du kannst dich regenerieren."
@@ -5671,24 +5730,24 @@ msgstr "Nicht möglich den host \" aufzulösen"
 msgid "Connection to server terminated. "
 msgstr "Verbindung mit Server abgebrochen. "
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s ist nicht in Deiner Party!"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr "Drucke '..'"
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr "Blinkender Name"
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr "Schwebende '...' Blase"
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr "Schwebende Blase"
 
diff --git a/po/el.po b/po/el.po
new file mode 100644
index 000000000..1c7d82811
--- /dev/null
+++ b/po/el.po
@@ -0,0 +1,5724 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <tassos19962009@hotmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: Greek (http://www.transifex.net/projects/p/manaplus/language/el/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/actorspritemanager.cpp:1168
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
+msgid "dodge"
+msgstr "υπευκφυγή"
+
+#: src/being.cpp:560
+msgid "miss"
+msgstr "αστοχία"
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+msgid "Setup"
+msgstr "Ρ�θμισεις"
+
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
+msgid "Connecting to server"
+msgstr "Σ�νδεση σε τονδιακομιστή"
+
+#: src/client.cpp:1104
+msgid "Logging in"
+msgstr "Σ�νδεση"
+
+#: src/client.cpp:1138
+msgid "Entering game world"
+msgstr "Μπαίνοντας στον κόσμο του παιχνιδιο� "
+
+#: src/client.cpp:1242
+msgid "Requesting characters"
+msgstr "Αναζητώντας χα�ακτή�ες"
+
+#: src/client.cpp:1277
+msgid "Connecting to the game server"
+msgstr "Σ�νδεση με τον διακομιστή του παιχνιδιο�"
+
+#: src/client.cpp:1287
+msgid "Changing game servers"
+msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
+
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: src/client.cpp:1348
+msgid "Requesting registration details"
+msgstr "Αναζητο�νται τα στοιχεία της εγγ�αφής"
+
+#: src/client.cpp:1374
+msgid "Password Change"
+msgstr "Αλλαγή κωδικο� π�όσβασης"
+
+#: src/client.cpp:1375
+msgid "Password changed successfully!"
+msgstr "Ο κωδικός σας άλλαξε με επιτυχία!"
+
+#: src/client.cpp:1394
+msgid "Email Change"
+msgstr "Αλλαγή ηλεκτ�ονικο� ταχυδ�ομείου"
+
+#: src/client.cpp:1395
+msgid "Email changed successfully!"
+msgstr "Ηλεκτ�ονικό ταχυδ�ομείο άλλαξε με επιτυχία!"
+
+#: src/client.cpp:1415
+msgid "Unregister Successful"
+msgstr "Διαγ�αφή Επιτυχής"
+
+#: src/client.cpp:1416
+msgid "Farewell, come back any time..."
+msgstr "Αντίο, να επιστ�έψεις κάθε στιγμή ..."
+
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr " %s δεν υπά�χει και δεν μπο�εί να δημιου�γηθεί!Έξοδος."
+
+#: src/client.cpp:1821
+#, c-format
+msgid "Invalid update host: %s"
+msgstr "Άκυ�α ενημέ�ωση υποδοχής: %s"
+
+#: src/client.cpp:1855 src/client.cpp:1861
+msgid "Error creating updates directory!"
+msgstr "Σφάλμα κατά τη δημιου�γία του καταλόγου ενημε�ώσεων!"
+
+#: src/client.cpp:1882
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr "Σφάλμα: %s δεν υπά�χει και δεν μπο�εί να δημιου�γηθεί! Εγκατάλειψη."
+
+#: src/commandhandler.cpp:215
+msgid "Unknown command."
+msgstr "Άγνωστη εντολή."
+
+#: src/commandhandler.cpp:335
+msgid "Cannot send empty whispers!"
+msgstr "Δεν είναι δυνατή η αποστολή άδειου ψιθ��ου!"
+
+#: src/commandhandler.cpp:349
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
+msgstr "Δεν μπο�εί να δημιου�γηθεί μια κα�τέλα ψίθυ�ου για nick \"%s \"! Είτε υπά�χει ήδη, ή είσαστε εσείς."
+
+#: src/commandhandler.cpp:369
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Ζητώντας να ενώσει κανάλι %s."
+
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
+msgid "Party name is missing."
+msgstr "Το όνομα του κόμματος λείπει. "
+
+#: src/commandhandler.cpp:396
+msgid "Guild name is missing."
+msgstr "Το όνομα της συντεχνείας λείπει."
+
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
+msgid "Please specify a name."
+msgstr "Ο�ίστε ένα όνομα."
+
+#: src/commandhandler.cpp:460
+msgid "Return toggles chat."
+msgstr ""
+
+#: src/commandhandler.cpp:460
+msgid "Message closes chat."
+msgstr ""
+
+#: src/commandhandler.cpp:471
+msgid "Return now toggles chat."
+msgstr ""
+
+#: src/commandhandler.cpp:477
+msgid "Message now closes chat."
+msgstr ""
+
+#: src/commandhandler.cpp:505
+msgid "friend"
+msgstr "φίλος"
+
+#: src/commandhandler.cpp:510
+msgid "disregarded"
+msgstr "αγνόησε"
+
+#: src/commandhandler.cpp:515
+msgid "neutral"
+msgstr "ουδέτε�ος"
+
+#: src/commandhandler.cpp:534
+#, c-format
+msgid "Player already %s!"
+msgstr "Παίκτης ήδη %s!"
+
+#: src/commandhandler.cpp:548
+#, c-format
+msgid "Player successfully %s!"
+msgstr "Παίκτης με επιτυχία %s!"
+
+#: src/commandhandler.cpp:556
+#, c-format
+msgid "Player could not be %s!"
+msgstr "Ο παίκτης δεν θα μπο�ο�σε να είναι %s!"
+
+#: src/commandhandler.cpp:579
+msgid "Player wasn't ignored!"
+msgstr "Ο παίκτης δεν αγνοήθηκε!"
+
+#: src/commandhandler.cpp:586
+msgid "Player no longer ignored!"
+msgstr "Παίκτης δεν είναι πλέον αγνοημένος!"
+
+#: src/commandhandler.cpp:588
+msgid "Player could not be unignored!"
+msgstr "Παίκτης δεν θα μπο�ο�σε να unignored!"
+
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
+msgid "Player already erased!"
+msgstr ""
+
+#: src/commandhandler.cpp:625
+msgid "Player successfully erased!"
+msgstr ""
+
+#: src/commandhandler.cpp:627
+msgid "Player could not be erased!"
+msgstr ""
+
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
+#, c-format
+msgid "Client uptime: %s"
+msgstr ""
+
+#: src/commandhandler.cpp:950
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:959
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:967
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:975
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:983
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1062
+msgid "font cache size"
+msgstr ""
+
+#: src/commandhandler.cpp:1074
+msgid "Cache size:"
+msgstr ""
+
+#: src/commandhandler.cpp:1078
+msgid "Created:"
+msgstr ""
+
+#: src/commandhandler.cpp:1080
+msgid "Deleted:"
+msgstr ""
+
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
+msgid "Resource images:"
+msgstr ""
+
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
+msgid "Resource orphaned images:"
+msgstr ""
+
+#: src/commandhandler.h:34
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+msgid "General"
+msgstr "Γενικά"
+
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+msgid "Debug"
+msgstr "Αποσφαλμάτωση"
+
+#: src/game.cpp:512
+msgid "Screenshot saved as "
+msgstr "Φωτογ�αφία αποθηκε�τηκε ως"
+
+#: src/game.cpp:520
+msgid "Saving screenshot failed!"
+msgstr "Σώσιμο φωτογ�αφίας απέτυχε"
+
+#: src/game.cpp:562
+msgid "The connection to the server was lost."
+msgstr "Η σ�νδεση με το διακομιστή χάθηκε."
+
+#: src/game.cpp:563
+msgid "Network Error"
+msgstr "Σφάλμα δικτ�ου"
+
+#: src/game.cpp:1275
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/game.cpp:1285
+msgid "Accepting incoming trade requests"
+msgstr "Αποδεχόμενος τα εισε�χόμενα αιτήματα του εμπο�ίου"
+
+#: src/game.cpp:1799
+msgid "Could Not Load Map"
+msgstr "Δε μπο�εί να φο�τώθει ο χά�της"
+
+#: src/game.cpp:1800
+#, c-format
+msgid "Error while loading %s"
+msgstr "Σφάλμα κατά τη φό�τωση %s"
+
+#: src/gui/beingpopup.cpp:124
+#, c-format
+msgid "Party: %s"
+msgstr "Κόμμα: %s"
+
+#: src/gui/beingpopup.cpp:138
+#, c-format
+msgid "Guild: %s"
+msgstr "Συντεχνία: %s"
+
+#: src/gui/beingpopup.cpp:151
+#, c-format
+msgid "Pvp rank: %d"
+msgstr "Παίκτης εναντίων παίκτη κατάταξη: %d"
+
+#: src/gui/beingpopup.cpp:162
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+msgid "Name"
+msgstr "Όνομα"
+
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
+msgid "Attack"
+msgstr "Επίθεση"
+
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
+msgid "Talk"
+msgstr "Συζήτηση"
+
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
+msgid "Move"
+msgstr "Κίνηση"
+
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
+msgstr "Αποτέλεσμα"
+
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
+msgid "Reset"
+msgstr "Επαναφο�ά"
+
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+msgid "Buy"
+msgstr "Αγο�ά"
+
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr ""
+
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
+msgid "+"
+msgstr "+"
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
+msgid "-"
+msgstr "-"
+
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
+msgid "Quit"
+msgstr "Έξοδος"
+
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
+msgid "Max"
+msgstr "Max"
+
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
+msgid "Shop"
+msgstr "Κατάστημα"
+
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:93
+msgid "Sell"
+msgstr "Πουλήστε"
+
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
+msgid "Cancel"
+msgstr "Ακ��ωση"
+
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
+msgid "Change Email Address"
+msgstr "Αλλαγή Διε�θυνση Ηλεκτ�ονικο� ταχυδ�ομείου"
+
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
+#, c-format
+msgid "Account: %s"
+msgstr "Λογα�ιασμός: %s"
+
+#: src/gui/changeemaildialog.cpp:54
+msgid "Type new email address twice:"
+msgstr "Πληκτ�ολογήστε τη νέα διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου δ�ο φο�ές:"
+
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Η νέα διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου π�έπει να είναι τουλάχιστον %d χα�ακτή�ες."
+
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Η νέα διε�θυνση ηλεκτ�ονικο� ταχυδ�ομείου π�έπει να είναι μικ�ότε�ο από %d χα�ακτή�ες."
+
+#: src/gui/changeemaildialog.cpp:146
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
+msgid "Change Password"
+msgstr "Αλλαγή κωδικο� π�όσβασης"
+
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
+msgid "Password:"
+msgstr "Κωδικός π�όσβασης:"
+
+#: src/gui/changepassworddialog.cpp:66
+msgid "Type new password twice:"
+msgstr "Πληκτ�ολογήστε τον νέο κωδικό π�όσβασης δ�ο φο�ές:"
+
+#: src/gui/changepassworddialog.cpp:114
+msgid "Enter the old password first."
+msgstr "Πληκτ�ολογήστε τον παλιό κωδικό π�όσβασης π�ώτα."
+
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Ο νέος κωδικός π�όσβασης π�έπει να είναι τουλάχιστον %d χα�ακτή�ες."
+
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Ο νέος κωδικός π�όσβασης π�έπει να είναι μικ�ότε�ος από %d χα�ακτή�ες."
+
+#: src/gui/changepassworddialog.cpp:134
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
+msgid "Name:"
+msgstr "Όνομα:"
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
+msgid ">"
+msgstr ">"
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
+msgid "<"
+msgstr "<"
+
+#: src/gui/charcreatedialog.cpp:106
+msgid "Hair color:"
+msgstr "Χ�ώμα μαλλιών:"
+
+#: src/gui/charcreatedialog.cpp:110
+msgid "Hair style:"
+msgstr "Στ�λ μαλιών:"
+
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
+msgid "Race:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
+msgid "Create"
+msgstr "Δημιου�γία"
+
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
+msgid "Male"
+msgstr "Άντ�ας"
+
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
+msgid "Female"
+msgstr "Γυναίκα"
+
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Πα�ακαλο�με να διανείμετε %d πόντους"
+
+#: src/gui/charcreatedialog.cpp:273
+msgid "Your name needs to be at least 4 characters."
+msgstr "Το όνομά σας π�έπει να είναι τουλάχιστον 4 χα�ακτή�ες."
+
+#: src/gui/charcreatedialog.cpp:359
+msgid "Character stats OK"
+msgstr "Στατιστικά χα�ακτη�α:εντάξει"
+
+#: src/gui/charcreatedialog.cpp:373
+#, c-format
+msgid "Please remove %d points"
+msgstr "Πα�ακαλώ αφαι�έστε %d πόντους"
+
+#: src/gui/charselectdialog.cpp:76
+msgid "Confirm Character Delete"
+msgstr "Επιβεβαίωση Διαγ�αφή Χα�ακτή�α"
+
+#: src/gui/charselectdialog.cpp:77
+msgid "Are you sure you want to delete this character?"
+msgstr "Είσαι σίγου�ος ότι θέλεις να διαγ�άψεις αυτό το χα�ακτή�α;"
+
+#: src/gui/charselectdialog.cpp:125
+msgid "Account and Character Management"
+msgstr "Λογα�ιασμός και Διαχεί�ιση Χα�ακτή�ων"
+
+#: src/gui/charselectdialog.cpp:139
+msgid "Switch Login"
+msgstr "Διακόπτης Σ�νδεση"
+
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
+msgid "Unregister"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:163
+msgid "Change Email"
+msgstr "Αλλαγή Ηλεκτ�ονικο� Ταχυδ�ομείου"
+
+#: src/gui/charselectdialog.cpp:256
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:289
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:289
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
+msgid "Delete"
+msgstr "Διαγ�αφή"
+
+#: src/gui/charselectdialog.cpp:471
+msgid "Choose"
+msgstr "Επιλέξτε"
+
+#: src/gui/charselectdialog.cpp:474
+#, c-format
+msgid "Level %d"
+msgstr "Επίπεδο %d"
+
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
+msgid "(empty)"
+msgstr "(Άδειο)"
+
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
+msgid "default"
+msgstr "π�οεπιλογή"
+
+#: src/gui/chatwindow.cpp:117
+msgid "black"
+msgstr "μα��ο"
+
+#: src/gui/chatwindow.cpp:118
+msgid "red"
+msgstr "κόκκινο"
+
+#: src/gui/chatwindow.cpp:119
+msgid "green"
+msgstr "π�άσινο"
+
+#: src/gui/chatwindow.cpp:120
+msgid "blue"
+msgstr "μπλε"
+
+#: src/gui/chatwindow.cpp:121
+msgid "gold"
+msgstr "χ�υσό"
+
+#: src/gui/chatwindow.cpp:122
+msgid "yellow"
+msgstr "κίτ�ινο"
+
+#: src/gui/chatwindow.cpp:123
+msgid "pink"
+msgstr "�οζ"
+
+#: src/gui/chatwindow.cpp:124
+msgid "purple"
+msgstr "μωβ"
+
+#: src/gui/chatwindow.cpp:125
+msgid "grey"
+msgstr "γκ�ί"
+
+#: src/gui/chatwindow.cpp:126
+msgid "brown"
+msgstr "καφέ"
+
+#: src/gui/chatwindow.cpp:127
+msgid "rainbow 1"
+msgstr "ου�άνιο τόξο 1"
+
+#: src/gui/chatwindow.cpp:128
+msgid "rainbow 2"
+msgstr "ου�άνιο τόξο 2"
+
+#: src/gui/chatwindow.cpp:129
+msgid "rainbow 3"
+msgstr "ου�άνιο τόξο 3"
+
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
+msgid "???"
+msgstr ";;;"
+
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
+msgid "Chat"
+msgstr "Συζήτηση"
+
+#: src/gui/chatwindow.cpp:654
+#, c-format
+msgid "Present: %s; %d players are present."
+msgstr ""
+
+#: src/gui/chatwindow.cpp:1041
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Ψιθυ�ίζοντας στο %s: %s"
+
+#: src/gui/confirmdialog.cpp:47
+msgid "Yes"
+msgstr "�αι"
+
+#: src/gui/confirmdialog.cpp:48
+msgid "No"
+msgstr "Δεν"
+
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
+msgid "Ignore"
+msgstr "Πα�άβλεψη"
+
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
+msgid "Map"
+msgstr "Χά�της"
+
+#: src/gui/debugwindow.cpp:73
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:74
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
+msgid "Player Position:"
+msgstr "Θέση Παίκτη :"
+
+#: src/gui/debugwindow.cpp:154
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
+#, c-format
+msgid "%d FPS (Software)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:168
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:171
+#, c-format
+msgid "%d FPS (old OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:178
+#, c-format
+msgid "%d FPS"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:233
+#, c-format
+msgid "Particle count: %d"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
+msgid "Target:"
+msgstr "Στόχος:"
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
+msgid "Target Id:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Επίπεδο Στόχου :"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
+#, c-format
+msgid "Ping: %s ms"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:400
+#, c-format
+msgid "In: %d bytes/s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:402
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:48
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
+msgid "Close"
+msgstr "Κλείσιμο"
+
+#: src/gui/didyouknowwindow.cpp:65
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:66
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:67
+msgid "Auto open this window"
+msgstr ""
+
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr "ΟΚ"
+
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+msgid "Equipment"
+msgstr "Εξοπλισμός"
+
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/helpwindow.cpp:44
+msgid "Help"
+msgstr "Βοήθεια"
+
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
+msgstr "Φίλτ�ο:"
+
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
+msgid "Equip"
+msgstr "Equip"
+
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
+msgid "Use"
+msgstr "Χ�ήση"
+
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
+msgid "Drop..."
+msgstr "Πέτα ..."
+
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
+msgid "Split"
+msgstr "Διαί�εση"
+
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
+msgid "Outfits"
+msgstr "Ρο�χα"
+
+#: src/gui/inventorywindow.cpp:178
+msgid "Weight:"
+msgstr "Βά�ος:"
+
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
+msgid "Store"
+msgstr "Κατάστημα"
+
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
+msgid "Retrieve"
+msgstr "Ανάκτηση"
+
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
+msgstr "Πέτα"
+
+#: src/gui/itemamountwindow.cpp:208
+msgid "All"
+msgstr "Όλες"
+
+#: src/gui/itemamountwindow.cpp:259
+msgid "Select amount of items to trade."
+msgstr "Επιλέξτε το ποσό των στοιχείων για ανταλαγή."
+
+#: src/gui/itemamountwindow.cpp:262
+msgid "Select amount of items to drop."
+msgstr "Επιλέξτε το ποσό των στοιχείων για πτώση."
+
+#: src/gui/itemamountwindow.cpp:265
+msgid "Select amount of items to store."
+msgstr "Επιλέξτε το ποσό των στοιχείων για αποθήκευση."
+
+#: src/gui/itemamountwindow.cpp:268
+msgid "Select amount of items to retrieve."
+msgstr "Επιλέξτε το ποσό των στοιχείων για ανάκτηση."
+
+#: src/gui/itemamountwindow.cpp:271
+msgid "Select amount of items to split."
+msgstr "Επιλέξτε το ποσό των στοιχείων για διαι�εση."
+
+#: src/gui/itemamountwindow.cpp:274
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:277
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:280
+msgid "Unknown."
+msgstr "Άγνωστο."
+
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
+msgid ", "
+msgstr ", "
+
+#: src/gui/itempopup.cpp:193
+#, c-format
+msgid "Weight: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:66
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:67
+msgid "Reset timer"
+msgstr "Επαναφο�ά χ�ονόμετ�ου"
+
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:363
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:369
+msgid "jacko spawning"
+msgstr ""
+
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Normal"
+msgstr "Κανονική"
+
+#: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr "Αυτόματο Κλείσιμο"
+
+#: src/gui/logindialog.cpp:62
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
+msgid "Login"
+msgstr "Είσοδος"
+
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "Διακοσμιτής:"
+
+#: src/gui/logindialog.cpp:98
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:112
+msgid "Remember username"
+msgstr "Θυμηθείτε το όνομα χ�ήστη"
+
+#: src/gui/logindialog.cpp:113
+msgid "Update:"
+msgstr "Ενημέ�ωση:"
+
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
+msgid "Register"
+msgstr "Εγγ�αφή"
+
+#: src/gui/logindialog.cpp:124
+msgid "Change Server"
+msgstr "Αλλαγή διακοσμιτή"
+
+#: src/gui/ministatuswindow.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:92
+msgid "weight bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
+msgid "Need"
+msgstr "Χ�ειάζεστε"
+
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
+msgid "Next"
+msgstr "Επόμενο"
+
+#: src/gui/npcdialog.cpp:55
+msgid "Submit"
+msgstr "Υποβολή"
+
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
+msgid "NPC"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
+msgid "Clear"
+msgstr "Σαφή"
+
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
+msgstr "Π�ος:"
+
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
+msgstr "Αποστολή"
+
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
+#, c-format
+msgid "Key: %s"
+msgstr "Κλειδί: %s"
+
+#: src/gui/outfitwindow.cpp:91
+msgid "Unequip first"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:94
+msgid "Away outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
+msgid "Whisper"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
+msgid "Heal"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
+msgid "Kick from guild"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
+msgid "Change pos in guild"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
+msgid "Invite to guild"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:266
+msgid "Kick player"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:268
+msgid "Nuke"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:313
+msgid "Kick"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:324
+msgid "Remove from attack list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:329
+msgid "Add to priority attack list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:331
+msgid "Add to attack list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:333
+msgid "Add to ignore list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
+msgid "Add name to chat"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
+msgid "Pick up"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
+msgid "Add to chat"
+msgstr "Π�οσθήκη στη συζήτηση"
+
+#: src/gui/popupmenu.cpp:567
+msgid "Map Item"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:568
+msgid "Rename"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
+msgid "Remove"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
+msgid "Spells"
+msgstr "Ξό�κια"
+
+#: src/gui/popupmenu.cpp:610
+msgid "Load old spells"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:611
+msgid "Edit spell"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:637
+msgid "Disable highlight"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:639
+msgid "Enable highlight"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:643
+msgid "Remove name"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:645
+msgid "Enable away"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:647
+msgid "Disable away"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
+msgid "Leave"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
+msgid "Change guild position"
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1336
+msgid "Rename map sign          "
+msgstr "Μετονομασία υπογ�άψει χά�τη "
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1338
+msgid "Name:                    "
+msgstr "Όνομα:"
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1383
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1385
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1787
+msgid "Add to trade"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1791
+msgid "Add to trade 10"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1792
+msgid "Add to trade half"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1793
+msgid "Add to trade all"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1803
+msgid "Store 10"
+msgstr "Κατάστημα 10"
+
+#: src/gui/popupmenu.cpp:1804
+msgid "Store half"
+msgstr "Αποθήκευσε τα μισά"
+
+#: src/gui/popupmenu.cpp:1805
+msgid "Store all"
+msgstr "Αποθηκε�στε όλα τα"
+
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
+msgid "Drop all"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1844
+msgid "Retrieve 10"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1845
+msgid "Retrieve half"
+msgstr "Ανέκτησε τα μισά"
+
+#: src/gui/popupmenu.cpp:1846
+msgid "Retrieve all"
+msgstr "Ανέκτησε όλα"
+
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
+msgid "Load old item shortcuts"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1984
+msgid "Load old drop shortcuts"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
+msgid "Hide"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
+msgid "Show"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2061
+msgid "Reset yellow bar"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
+msgid "Copy to chat"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
+msgid "(default)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
+msgid "Move up"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
+msgid "Move down"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:52
+msgid "Switch server"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:53
+msgid "Switch character"
+msgstr ""
+
+#: src/gui/register.cpp:77
+msgid "Confirm:"
+msgstr "Επιβεβαίωση:"
+
+#: src/gui/register.cpp:108
+msgid "Email:"
+msgstr "Ηλεκτ�ονικό ταχυδ�ομείο:"
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr "Οι κωδικοί π�όσβασης δεν ται�ιάζουν."
+
+#: src/gui/serverdialog.cpp:228
+msgid "Choose Your Server"
+msgstr "Επιλέξε τον διακοσμιτή σου"
+
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:243
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:263
+msgid "Connect"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Π�οσθήκη"
+
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:444
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:449
+msgid "Waiting for server..."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:453
+msgid "Preparing download"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:457
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:548
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:59
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:63
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:65
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:69
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:71
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:74
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:78
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:80
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:83
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:87
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:89
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:93
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:95
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:98
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:101
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:104
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:107
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:110
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:113
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:119
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
+msgid "This is what the color looks like"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:75
+msgid "Type:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
+msgid "Static"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
+msgid "Pulse"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
+msgid "Rainbow"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
+msgid "Spectrum"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
+msgid "Delay:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:112
+msgid "Red:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:127
+msgid "Green:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:142
+msgid "Blue:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:75
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
+msgid "Calibrate"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:47
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:122
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:80
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:89
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
+msgid "Default"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:133
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_other.cpp:38
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:49
+msgid "Auto target only reachable monsters"
+msgstr "Αυτόματη στόχος π�οσιτοί μόνο τέ�ατα"
+
+#: src/gui/setup_other.cpp:52
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:56
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:59
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:65
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:68
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:71
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:74
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:77
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:80
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:83
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:98
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:101
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:111
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:113
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:116
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:119
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:122
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:125
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:128
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:131
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:134
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:137
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:143
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:146
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:152
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:170
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
+
+#: src/gui/setup_other.cpp:177
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:180
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:183
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:186
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:54
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:57
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:60
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:63
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:66
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:69
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:72
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:82
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:85
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:88
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:56
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:68
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:71
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:74
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:77
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:71
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:72
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:73
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:74
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:75
+msgid "Erased"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:245
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:248
+msgid "Old"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:250
+msgid "Relations"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:272
+msgid "When ignoring:"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:82
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:83
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:84
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:86
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:87
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:167
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:170
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:171
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:172
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:173
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:352
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
+msgstr ""
+
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
+msgstr ""
+
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr ""
+
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr ""
+
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
+msgstr "Πληκτ�ολογήστε το νέα ανάλυση:"
+
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
+msgstr "Ανάλυση οθόνης Άλλαξε"
+
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr "Με�ικά πα�άθυ�α μπο�ο�ν να μετακινο�νται για να ται�ιάξει στην χαμηλότε�η ανάλυση."
+
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
+msgid "Personal Shop"
+msgstr "Π�οσωπικό Μαγαζί"
+
+#: src/gui/shopwindow.cpp:119
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:120
+msgid "Sell items"
+msgstr "Πουλήστε αντικείμενα"
+
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:128
+msgid "Show links in announce"
+msgstr "Εμφάνιση συνδέσμων στις ανακοινώσεις"
+
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:762
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
+msgid "Skills"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:288
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:341
+#, c-format
+msgid "Skill points available: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
+#, c-format
+msgid "Skill Set %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:432
+#, c-format
+msgid "Skill %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:546
+#, c-format
+msgid "Lvl: %d (%+d)"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
+msgid "Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:174
+#, c-format
+msgid "Invited user %s to guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:188
+#, c-format
+msgid "Guild %s quit requested."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:215
+msgid "Member Invite to Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:216
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:225
+msgid "Leave Guild?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:226
+#, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:374
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:388
+#, c-format
+msgid "Party %s quit requested."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:415
+msgid "Member Invite to Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:416
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:425
+msgid "Leave Party?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:426
+#, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:650
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:928
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:969
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1001
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1036
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1196
+msgid "Create Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
+msgid "Create Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+msgid "Social"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1262
+msgid "Invite"
+msgstr ""
+
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1425
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1442
+#, c-format
+msgid "Accepted guild invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1455
+#, c-format
+msgid "Rejected guild invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1502
+#, c-format
+msgid "Creating guild called %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1525
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1539
+msgid "Guild Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1540
+msgid "Choose your guild's name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1554
+msgid "Received guild request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1560
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1566
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1581
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1592
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1596
+#, c-format
+msgid "You have been invited to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1604
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1609
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1618
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1633
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1638
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1639
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+msgid "Specials"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
+#, c-format
+msgid "Level: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:157
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:164
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:178
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:211
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
+#, c-format
+msgid "Character points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:275
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:331
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:112
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:119
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:167
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:184
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:188
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:193
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:196
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:208
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:214
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:220
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:226
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:232
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:237
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
+msgid "Propose trade"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:61
+msgid "Confirmed. Waiting..."
+msgstr ""
+
+#: src/gui/tradewindow.cpp:62
+msgid "Agree trade"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:63
+msgid "Agreed. Waiting..."
+msgstr ""
+
+#: src/gui/tradewindow.cpp:66
+msgid "Trade: You"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
+#, c-format
+msgid "You get %s"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:112
+msgid "You give:"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:116
+msgid "Change"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
+msgstr ""
+
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/unregisterdialog.cpp:54
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:140
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:167
+msgid "Connecting..."
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:170
+msgid "Play"
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:571
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updaterwindow.cpp:573
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updaterwindow.cpp:575
+msgid "##1  you try again later."
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:751
+msgid "Completed"
+msgstr ""
+
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:103
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:197
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:631
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:670
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/users > Lists the users in the current channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/topic > Set the topic of the current channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:54
+msgid "/quit > Leave a channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:55
+msgid "/op > Make a user a channel operator"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:56
+msgid "/kick > Kick a user from the channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:66
+msgid "Command: /users"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:67
+msgid "This command shows the users in this channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:71
+msgid "Command: /topic <message>"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:72
+msgid "This command sets the topic to <message>."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:76
+msgid "Command: /quit"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:77
+msgid "This command leaves the current channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:78
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:83
+msgid "Command: /op <nick>"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:84
+msgid "This command makes <nick> a channel operator."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Εάν το <nick> εχει διαστήματα, πε�ικλείστε την σε διπλά εισαγωγικά (\")."
+
+#: src/gui/widgets/channeltab.cpp:87
+msgid "Channel operators can kick and op other users from the channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:92
+msgid "Command: /kick <nick>"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:93
+msgid "This command makes <nick> leave the channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:118
+msgid "Need a user to op!"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:125
+msgid "Need a user to kick!"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:151
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:157
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:184
+#, c-format
+msgid "%s whispers: %s"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:107
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:108
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:109
+msgid "/close > Close the whisper tab"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:119
+msgid "Command: /close"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:120
+msgid "This command closes the current whisper tab."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:124
+msgid "Command: /ignore"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:125
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr "Εντολή : / κατά�γηση πα�άβλεψης <player>"
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "Status"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Select World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:82
+msgid "Change Login"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:83
+msgid "Choose World"
+msgstr ""
+
+#: src/inventory.cpp:251
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:253
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
+msgid "Move Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:47
+msgid "Move Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:48
+msgid "Move Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:49
+msgid "Move Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:52
+msgid "Target & Attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:54
+msgid "Move to Target"
+msgstr ""
+
+#: src/keyboardconfig.cpp:56
+msgid "Change Move to Target type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:58
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:60
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:62
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
+msgid "Target Closest"
+msgstr ""
+
+#: src/keyboardconfig.cpp:70
+msgid "Target NPC"
+msgstr ""
+
+#: src/keyboardconfig.cpp:71
+msgid "Target Player"
+msgstr ""
+
+#: src/keyboardconfig.cpp:73
+msgid "Pickup"
+msgstr ""
+
+#: src/keyboardconfig.cpp:74
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:76
+msgid "Hide Windows"
+msgstr ""
+
+#: src/keyboardconfig.cpp:78
+msgid "Sit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:79
+msgid "Screenshot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:80
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82
+msgid "Change Map View Mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
+msgid "Help Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:133
+msgid "Status Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:135
+msgid "Inventory Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:137
+msgid "Equipment Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:139
+msgid "Skill Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:141
+msgid "Minimap Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:143
+msgid "Chat Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:145
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:147
+msgid "Setup Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:149
+msgid "Debug Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:151
+msgid "Social Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:153
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:155
+msgid "Outfits Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:157
+msgid "Shop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:163
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:165
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:170
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:173
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:175
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:283
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:285
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
+msgid "Toggle Chat"
+msgstr ""
+
+#: src/keyboardconfig.cpp:290
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:292
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:294
+msgid "Previous Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Next Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:310
+msgid "Ignore input 1"
+msgstr ""
+
+#: src/keyboardconfig.cpp:312
+msgid "Ignore input 2"
+msgstr ""
+
+#: src/keyboardconfig.cpp:314
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:318
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:320
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:322
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:324
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:326
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:328
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:332
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:334
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:336
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:342
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:344
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:346
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:348
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:351
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:352
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:354
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:356
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:358
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:360
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:439
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
+msgstr ""
+
+#: src/localplayer.cpp:1436
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1439
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1442
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1445
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1448
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1451
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1454
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1478
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
+msgid "Away"
+msgstr ""
+
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
+msgid "Follow: "
+msgstr ""
+
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
+msgid "Follow canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3792
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:4150
+msgid "You see "
+msgstr ""
+
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
+msgstr ""
+
+#: src/main.cpp:61
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:62
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#: src/main.cpp:63
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:64
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:65
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#: src/main.cpp:66
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#: src/main.cpp:67
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#: src/main.cpp:68
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#: src/main.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#: src/main.cpp:70
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#: src/main.cpp:71
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#: src/main.cpp:72
+msgid "     --update-host    : Use this update host"
+msgstr ""
+
+#: src/main.cpp:73
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#: src/main.cpp:75
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:76
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#: src/main.cpp:78
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#: src/main.cpp:80
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#: src/main.cpp:81
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
+msgstr ""
+
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
+msgstr ""
+
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Strength:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Agility:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Vitality:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:69
+msgid "Intelligence:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:70
+msgid "Dexterity:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:71
+msgid "Luck:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:115
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:119
+msgid "Cannot use this ID."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:122
+msgid "Unknown char-server failure."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:158
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:161
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:164
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182
+msgid "Character deleted."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:188
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:129
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:137
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:346
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:350
+msgid "MVP player: "
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
+msgid "Guild name: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:185
+#, c-format
+msgid "Online members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:187
+#, c-format
+msgid "Max members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:189
+#, c-format
+msgid "Average level: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:191
+#, c-format
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:412
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:416
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:420
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:424
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:428
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:464
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:512
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:75
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:85
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:92
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:96
+msgid "Command: /item <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:99
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "Command: /item"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:103
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "Command: /exp <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:109
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:111
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "Command: /exp"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:115
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:158
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:197
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:404
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:572
+msgid "Unable to equip."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:132
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:138
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Unregistered ID."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid "Wrong password."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:220
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:223
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:226
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:230
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:233
+#, 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/ea/loginhandler.cpp:240
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:243
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:249
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:81
+msgid "Could not create party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:83
+msgid "Party successfully created."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:139
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:175
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:180
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:185
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:190
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:195
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:359
+msgid "You have left the party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:372
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:449
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
+msgid "You are dead."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:103
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You are no more."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You have ceased to be."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:130
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:133
+msgid "You are an ex-player."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:134
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
+msgid "Message"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:453
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:459
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:505
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:623
+msgid "Equip arrows first."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:143
+msgid "Trade failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:146
+msgid "Emote failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Sit failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Could not join party!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:171
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:174
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:180
+msgid "You have no memos!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:183
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:186
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:189
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:199
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:202
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:213
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:216
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:219
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:135
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:242
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:247
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:251
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:338
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:148
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:151
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:154
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:157
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:160
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:163
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:166
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:169
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:304
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:320
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:331
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:337
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:90
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:100
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:207
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:212
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:156
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:159
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:167
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:249
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:278
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:315
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:318
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:321
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:324
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:90
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:108
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:107
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:109
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:146
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:108
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:139
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:142
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:152
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:162
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:270
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:274
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:277
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:279
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:281
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:282
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:284
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:286
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:357
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:427
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:172
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:480
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:500
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:542
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:545
+msgid "Floating bubble"
+msgstr ""
+
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:61
+#, c-format
+msgid "Attack %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:62
+#, c-format
+msgid "Defense %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:63
+#, c-format
+msgid "HP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:64
+#, c-format
+msgid "MP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:167
+msgid "Unknown item"
+msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index adb783313..4db72005a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,15 +2,16 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
-# Necromonger <Necromong@inbox.ru>, 2011.
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
+# Necromonger <Necromong@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,342 +19,364 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "dodge"
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr "miss"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Setup"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr "Video"
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Connecting to server"
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Logging in"
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Entering game world"
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Requesting characters"
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "Connecting to the game server"
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Changing game servers"
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Requesting registration details"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Password Change"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Unknown command."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Cannot send empty whispers!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, 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."
+msgstr "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is you."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Requesting to join channel %s."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Party name is missing."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Return toggles chat."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Message closes chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Return now toggles chat."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Message now closes chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Saving screenshot failed!"
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Network Error"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoring incoming trade requests"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Accepting incoming trade requests"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Error while loading %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -362,23 +385,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Name"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Attack"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Talk"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -386,79 +410,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Buy"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Price: %s / Total: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Exit"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Shop"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Sell"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -494,7 +522,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Password:"
@@ -521,81 +549,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "Create Character"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Name:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Create"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Male"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Female"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Please distribute %d points"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Your name needs to be at least 4 characters."
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Character stats OK"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Please remove %d points"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "Confirm Character Delete"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "Are you sure you want to delete this character?"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "Account and Character Management"
 
@@ -603,120 +636,122 @@ msgstr "Account and Character Management"
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Unregister"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Delete"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Whispering to %s: %s"
@@ -729,508 +764,553 @@ msgstr "Yes"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Map"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Close"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Equipment"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Unequip"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
-msgstr "Inventory"
-
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
-msgstr "Slots:"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr "Inventory"
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
+msgstr "Slots:"
+
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Equip"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Use"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Split"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "Weight:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Store"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Retrieve"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Drop"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "All"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Select amount of items to trade."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Select amount of items to drop."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Select amount of items to store."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Select amount of items to retrieve."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Select amount of items to split."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Register"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Waiting for server"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Next"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Submit"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "To:"
@@ -1243,345 +1323,382 @@ msgstr "Send"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Failed to send as sender or letter invalid."
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Trade"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "Players"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Switch server"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Switch character"
 
@@ -1625,200 +1742,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Add"
 
-#: src/gui/serverdialog.cpp:393
-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/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Audio"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Sfx volume"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Music volume"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Colours"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Put all whispers in tabs"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "This is what the colour looks like"
@@ -1866,41 +2022,41 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Apply"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Reset Windows"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Press the button to start calibration"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Calibrate"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Enable joystick"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1922,360 +2078,460 @@ msgstr "Default"
 msgid "Key Conflict(s) Detected."
 msgstr "Key Conflict(s) Detected."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monsters"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "Players"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Visible names"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Friend"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Disregarded"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignored"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Allow trading"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Allow whispers"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "When ignoring:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Font size"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Restart your client for the change to take effect."
 
@@ -2291,408 +2547,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "No text"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Text"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Bubbles, no names"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Bubbles with names"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "off"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "low"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "high"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "medium"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Full screen"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Custom cursor"
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
-msgstr "Particle effects"
-
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
-msgstr "Show pickup notification"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
-msgstr "in chat"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
+msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
-msgstr "as particle"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
+msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Video"
-
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
-msgstr "Overhead text"
-
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
-msgstr "Gui opacity"
-
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr "Ambient FX"
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Restart needed for changes to take effect."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applying change to OpenGL requires restart."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
-msgstr "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Gui opacity"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "No text"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Text"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Bubbles, no names"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Bubbles with names"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Overhead text"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "off"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "low"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "high"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Ambient FX"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Particle effects"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "medium"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr "Add"
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Request for Trade"
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Skills"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr "Up"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Create Guild"
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Received party request, but one already exists."
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s has invited you to join their party."
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s has invited you to join the %s party."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Accept Party Invite"
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2700,502 +2989,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3219,61 +3145,60 @@ msgstr "Agreed. Waiting..."
 msgid "Trade: You"
 msgstr "Trade: You"
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr "You give:"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "Change"
 
-#: src/gui/tradewindow.cpp:332
-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/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:375
 msgid "You don't have enough money."
 msgstr "You don't have enough money."
 
+#: src/gui/tradewindow.cpp:454
+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/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Name: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Updating..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Connecting..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Play"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  The update process is incomplete."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  It is strongly recommended that"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Completed"
 
@@ -3425,23 +3350,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3506,7 +3431,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "This command makes <nick> a channel operator."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 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 (\")."
 
@@ -3544,6 +3470,41 @@ msgstr "Global announcement from %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3673,557 +3634,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Move Up"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Move Down"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Move Left"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Move Right"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Target & Attack"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Smiley"
-
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Stop Attack"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Target NPC"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Target Player"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Pick up"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Hide Windows"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Sit"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Allow/Disallow Trading"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr "Select OK"
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Item Shortcut %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Help Window"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Status Window"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Inventory Window"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Equipment Window"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Skill Window"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Minimap Window"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Chat Window"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Item Shortcut Window"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Setup Window"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Emote Shortcut Window"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr "Smiley"
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emote Shortcut %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Toggle Chat"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Scroll Chat Up"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Scroll Chat Down"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Previous Chat Tab"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Next Chat Tab"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ignore input 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Options:"
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4239,142 +4516,130 @@ msgstr "Thanks for buying."
 msgid "Unable to buy."
 msgstr "Unable to buy."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4408,424 +4673,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "You are dead."
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 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/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "You are not that alive anymore."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 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/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 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."
+msgstr "No, kids. Your character did not really die. It... err... went to a better place."
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 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."
+msgstr "Your plan of breaking your enemy's weapon by bashing it with your throat failed."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "I guess this did not run too well."
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Do you want your possessions identified?"
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Sadly, no trace of you was ever found..."
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Annihilated."
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Looks like you got your head handed to you."
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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."
+msgstr "You screwed up again, dump your body down the tubes and get yourself another one."
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4839,160 +5094,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wants to trade with you, do you accept?"
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "Trade canceled."
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "Trade completed."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Strength"
 
@@ -5001,7 +5256,7 @@ msgstr "Strength"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Agility"
 
@@ -5010,7 +5265,7 @@ msgstr "Agility"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Dexterity"
 
@@ -5019,7 +5274,7 @@ msgstr "Dexterity"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Vitality"
 
@@ -5028,7 +5283,7 @@ msgstr "Vitality"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Intelligence"
 
@@ -5298,41 +5553,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr "Strength %+d"
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr "Agility %+d"
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitality %+d"
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence %+d"
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Dexterity %+d"
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr "Luck %+d"
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5340,129 +5595,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr "Disconnected from server!"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Luck"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s is not in your party!"
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "unnamed"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Attack %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Defense %+d"
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Unknown item"
-
-
diff --git a/po/eo.po b/po/eo.po
index 9fb2f6f37..9525be372 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,340 +18,364 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -359,23 +384,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -383,79 +409,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr ""
 
@@ -491,7 +521,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr ""
@@ -518,81 +548,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr ""
 
@@ -600,120 +635,122 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -726,508 +763,553 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1240,345 +1322,382 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -1622,200 +1741,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:64
-msgid "Sfx volume"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:65
-msgid "Music volume"
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1863,40 +2021,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1919,360 +2077,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr ""
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2288,408 +2546,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2697,502 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3216,26 +3144,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3243,33 +3171,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3421,23 +3349,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3502,7 +3430,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3540,6 +3469,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3669,557 +3633,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4235,142 +4515,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4404,418 +4672,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4829,160 +5093,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -4991,7 +5255,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -5000,7 +5264,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5009,7 +5273,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5018,7 +5282,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5288,41 +5552,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5330,129 +5594,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "sennoma"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/es.po b/po/es.po
index cdbb59b52..418ce2876 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,80 +12,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-05 23:20+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
-"manaplus/team/es/)\n"
+"manaplus/language/es/)\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "Visible sobre el mapa"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "evade"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Rendimiento"
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -95,63 +99,63 @@ msgstr "Cambiando servidores del juego"
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Servidor de actualización inválido: %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "¡Error al crear la carpeta de actualizaciones!"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Comando desconocido."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "¡No puedes enviar susurros vacíos!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,160 +164,160 @@ msgstr ""
 "¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando la entrada del canal %s."
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Falta el nombre del grupo."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "Falta el nombre del Clan."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Mensaje cierra la charla."
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "amigo"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "desatendido"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "neutral"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya es %s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Jugador %s exitosamente!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estaba ignorado!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr "en la lista negra"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr "enemigo"
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "¡Jugador borrado con éxito!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "tamaño de caché de fuente"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr "Tam. caché:"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "Creado:"
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "Borrado:"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
@@ -323,11 +327,11 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "General"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "Depurador"
 
@@ -388,18 +392,18 @@ msgstr "Comentario: %s"
 msgid "Bot Checker"
 msgstr "Bot Checker"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Nombre"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Hablar"
 
@@ -437,7 +441,7 @@ msgstr "Cantidad:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -445,25 +449,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Salir"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Tienda"
 
@@ -487,8 +491,8 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Cancelar"
@@ -661,8 +665,8 @@ msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Borrar"
 
@@ -680,6 +684,7 @@ msgid "(empty)"
 msgstr "(vacío)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "predeterminado"
 
@@ -737,24 +742,23 @@ msgstr "arco iris 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores están presentes."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
@@ -778,7 +782,7 @@ msgid "Ignore"
 msgstr "Ignorar"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Mapa"
 
@@ -853,62 +857,76 @@ msgstr "Contador de Texturas:"
 msgid "Particle count: %d"
 msgstr "Recuento de partículas: %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Objetivo:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "Id de Objetivo:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
-msgstr "Nivel del Objetivo:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
-msgstr "Grupo del Objetivo:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
-msgstr "Clan del Objetivo:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "Retraso de ataque:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr "Golpe mínimo:"
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr "Golpe máximo:"
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr "Golpe crítico:"
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Nivel del Objetivo:"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Grupo del Objetivo:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Clan del Objetivo:"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Recibiendo: %d bytes/s"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Enviando: %d bytes/s"
@@ -935,8 +953,8 @@ msgstr "Siguiente >"
 msgid "Auto open this window"
 msgstr "Abrir automáticamente esta ventana"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -1049,7 +1067,7 @@ msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Almacenar"
 
@@ -1108,91 +1126,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Estadísticas"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "Restablecer estadísticas"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "Restablecer cronometrador"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nivel: %d de %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d/%d Queda: %d"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, prom. criatura para 1%%: %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Muertes: %s, exp. total: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Exp prom.: %s, Prom. de criatura para siguiente nivel: %s"
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Matanza/Mín: %s, Exp/Mín: %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rapidez de experiencia por %d minuto: %s"
 msgstr[1] "Rapidez de experiencia por %d minutos: %s"
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tiempo para el siguiente nivel por %d minuto: %s"
 msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s"
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "Exp de último eliminado:"
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr "Tiempo antes de que jacko aparezca:"
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tiempo para el siguiente nivel: %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "¿%s %d?"
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr "jacko apareciendo"
 
@@ -1293,7 +1311,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
@@ -1403,7 +1421,7 @@ msgstr "Des-ignorar"
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1499,7 +1517,7 @@ msgstr "Agregar a la lista de ignorados"
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Jugadores"
 
@@ -1666,12 +1684,12 @@ msgstr "Mostrar"
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(predeterminado)"
@@ -1749,25 +1767,25 @@ msgstr "Conectar"
 msgid "Add"
 msgstr "Añadir"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Editar"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "¡Error al recuperar la lista de servidores!"
 
@@ -1780,157 +1798,190 @@ msgstr "requiere una versión mas nueva"
 msgid "requires v%s"
 msgstr "requiere v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Habilitar Audio"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "Habilitar música"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "Habilitar sfx del juego"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "Habilitar sfx de interfaz gráfica"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "Habilitar música"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "Habilitar el chat de voz de mumble"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "Bajar Música"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Audio"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Volumen de sfx"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Volumen de Música"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Anuncio"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
-msgstr "Necesitas reiniciar el cliente si quieres descargar nueva música"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Mecanismo de Sonido"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "Otro"
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "Habilitar el chat de voz de mumble"
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "Bajar Música"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Colores"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Remover los colores de los mensajes recibidos en el chat"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Mostrar lista de colores del chat"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 "Permitir utilizar los comandos de magia y GM en todo tipo de ventana de "
 "diálogo"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "Límites"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Limitar máx. de caracteres en la línea de chat"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Limitar líneas máx. en chat"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "Registros"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "Habilitar registro de chat"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Mostrar historial del chat"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "Mensajes"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Ocultar mensajes de la tienda"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "Pestañas"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Mostrar nuevos susurros en pestañas"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "Registrar mensajes de magia en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "Habilitar pestaña de intercambio"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "Habilitar pestaña de batalla"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalla"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr "Si hace falta, cambia el tamaño de pestañas del chat"
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "Tiempo"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "Usar hora local"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "Otro"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr "Resaltar palabras (separadas por coma)"
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr "Mostrar mensajes MVP"
 
@@ -1981,41 +2032,41 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Restaurar Ventanas"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Presiona el botón para empezar la calibración"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Habilitar la palanca de mando"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr "Usar la palanca de mando si la ventana del cliente está inactiva"
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Palanca de Mando"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
-msgstr "Girar la palanca y no presionar los botones"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2037,456 +2088,460 @@ msgstr "Por defecto"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflicto de teclas detectado."
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "Misceláneo"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstruos"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Mostrar daño infligido a monstruos"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "Eligir automáticamente sólo a los monstruos alcanzables"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Resaltar el alcance de ataque de los monstruos"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de energía del monstruo"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "Apuntar a los monstruos en derredor, no necesariamente al más cercano"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr "Mostrar las partículas de efectos"
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "Resaltar las puertas del mapa"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Resaltar los objetos sobre el suelo"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Resaltar el alcance de ataque del jugador"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr "Mostrar mini-mapas extendidos"
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "Dibujar trayectoria"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr "Dibujar teclas de acceso rápido en el mapa"
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr "Habilitar desplazamiento perezoso"
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr "Pereza al desplazarse"
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr "Radio de desplazamiento"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "En movimiento"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "Corrección automática de la posición"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "Atacar mientras está en movimiento"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "Sincronización de movimiento de jugador"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "Programa de movimientos locos A"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "Jugador"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Mostrar barra de energía propia"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "Habilitar estadísticas rápidas"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "Apuntar a los jugadores en derredor, no necesariamente al más cercano"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "Mostrar los mensajes de experiencia de trabajo"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "Mostrar las ventanas emergentes de jugadores"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr "Mensaje afk"
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "Mostrar trabajo"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr "Habilitar el protocolo de anuncio"
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Aceptar solicitudes de compra/venta"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "Habilitar la tienda"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "Registro de diálogo de NPC"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr "Soporte de bots"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr "Habilitar soporte para auction bot"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Habilitar soporte de bot clan y deshabilitar soporte de clan nativo"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr "Habilitar el ataque del lado del servidor"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Habilitar el control de bot"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Activar la protección de servidores con errores (no deshabilitar)"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "Habilitar registro de depuración"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "Modo de bajo tráfico"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite protector"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Mostrar fondo"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Mejor rendimiento (permite obtener un mejor rendimiento)"
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr "Ajustar rendimiento automáticamente"
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "Aceleración de hardware"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr "Habilitar caché de opacidad (Software, puede usar mucha memoria)"
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr "Habilitar reducción de mapa (Software)"
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr "Mejor calidad (desabilitar para un mejor desmpeño)"
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Habilitar corrección de canal alfa (Software, puede ser muy lento)"
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr "Mostrar transparencia de criaturas"
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr "Habilitar re-ordenamiento de sprites."
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Poca memoria (permite un uso más bajo de memoria)"
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr "Deshabilitar caché avanzado de criaturas (Software)"
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr "Deshabilitar caché de criaturas (Software)"
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Mostrar género"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Mostrar nivel"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Mostrar nombre propio"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr "Activar la selección extendida con el ratón"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "Apuntar a jugadores muertos"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Nombres Visibles"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr "Intercambios seguros"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr "Caracteres inseguros en los nombres"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr "Mostrar estados"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr "Mostrar dirección IP en la captura de pantalla"
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr "Permitir curarse a sí mismo con clic del ratón"
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relación"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Amigo"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Desatendido"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Borrado"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr "En la lista negra"
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr "Enemigo"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Permitir intercambios"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Permitir mensajes privados"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Viejo"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "Relaciones"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Cuando se ignora a alguien:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Diminuto (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Pequeño (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Medio (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Extenso (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr "Chino (China)"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr "Checo"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr "Inglés"
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr "Francés"
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr "Alemán"
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr "Indonesio"
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr "Polaco"
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr "Japonés"
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Holanda (Bélgica/Flandes)"
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr "Portugués (Brasileño)"
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr "Ruso"
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr "Español (Castellano)"
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "Tema de interfaz gráfica"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr "Idioma"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "Fuente principal"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Fuente negrita"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "Fuente de partícula"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "Fuente de la ayuda"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr "Fuente segura"
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr "Fuente japonesa"
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Tamaño de fuente"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Tema cambiado"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el juego para que los cambios tengan efecto."
 
@@ -2502,159 +2557,165 @@ msgstr "OpenGL Rápido"
 msgid "Safe OpenGL"
 msgstr "OpenGL Seguro"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Sin texto"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Texto"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Burbujas sin nombres"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Burbujas con nombres"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "apagado"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "bajo"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "alto"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "medio"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "máximo"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Cursor propio"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Efectos de partículas"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Mostrar aviso al coger algo"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "en el chat"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "como partícula"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr "Permitir cambiar de tamaño"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr "Sin marco"
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "Límite FPS:"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "Límite FPS alternativo: "
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr "Sobrecarga de texto"
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "Opacidad de interfaz"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "Ambiente FX"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "Detalle de partículas"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "Nada"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 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:500
+#: src/gui/setup_video.cpp:384
 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:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:                "
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 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/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "Configuración del efecto de las partículas cambiado."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Opacidad de interfaz"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Sin texto"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Texto"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Burbujas sin nombres"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Burbujas con nombres"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Sobrecarga de texto"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "apagado"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "bajo"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "alto"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Ambiente FX"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Efectos de partículas"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "medio"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "máximo"
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "Los cambios tendrán efecto cuando se cambie de mapa."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "Detalle de partículas"
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2737,7 +2798,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "Nivel: %d (%+d)"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Clan"
 
@@ -2769,7 +2830,7 @@ msgstr "¿Dejar el clan?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "¿Estás seguro de dejar el clan %s?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupo"
 
@@ -2941,139 +3002,139 @@ msgstr "Escoge el nombre del grupo."
 msgid "Specials"
 msgstr "Especiales"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Trabajo: %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Trabajo:"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr "Puntos del personaje: %d"
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nivel: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr "Puntos de corrección: %d"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Ningún objetivo"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "Permitir fijar objetivo"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "Necesita fijar objetivo."
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Magia General"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Magia de Vida"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Magia de Guerra"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Magia de Transmutación"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Magia de la Naturaleza"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "Magia Astral"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "Editor de comando"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "otro"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "Símbolo:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Maná:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Tipo de objetivo:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "�cono:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Nivel de Magia:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "Escuela de Magia:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "Nivel de Escuela:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Guardar"
 
@@ -3303,7 +3364,7 @@ msgstr "Limites de Lugar de Inicio"
 msgid "Road Point"
 msgstr "Mostrar camino"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
@@ -3311,15 +3372,15 @@ msgstr "Quién está conectado - Actualizando"
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "Quienes están conectados - "
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "Quienes están conectados - error"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Quienes están conectados - Actualizar"
 
@@ -3384,8 +3445,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Hacer al jugador <nick> operador del canal."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Si el <nick> tiene espacios, enciérralo entre comillas dobles (\")."
 
@@ -3425,38 +3486,38 @@ msgstr "Anuncio global de  %s:"
 msgid "%s whispers: %s"
 msgstr "%s envía mensaje privado: %s"
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr "Comando: /invite <nick>"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 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/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr "Este comando hace que dejes el clan."
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr "/help > Mostrar la ayuda."
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Invitar a un jugador a tu clan"
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Dejar el clan en el que estás"
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Expulsar a alguien del clan en el que estás."
 
@@ -3598,427 +3659,427 @@ msgstr "Almacenamiento"
 msgid "Cart"
 msgstr "Mochila"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr "Teclas Básicas"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Mover para arriba"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Mover para abajo"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Izquierda"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Derecha"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Seleccionar & Atacar"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "Mover al objetivo"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "Cambiar Movimiento al tipo de Objetivo"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr "Mover hacia la localización Inicial"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr "Estableces la localización Inicial"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr "Mover al punto de navegación"
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Dejar de atacar"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr "Sin seleccionar"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "Apuntar al más cercano"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Seleccionar NPC"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Seleccionar Jugador"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Coger"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "Cambiar el tipo de recogida"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Esconder ventanas"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Sentarse"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Imprimir pantalla"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Deshabilitar Intercambios"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "Cambiar el tipo de vista del mapa"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "Seleccionar OK"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr "Teclas de Atajos"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr "Tecla de acceso directo de objeto"
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atajo para el objeto %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr "Teclas de Ventanas"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Ventana de ayuda"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Ventana de Estado"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Ventana de inventario"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Ventana de equipamiento"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Ventana de habilidades"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Ventana del Mini-mapa"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Ventana de Chat"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Ventana de atajos para objetos"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Ventana de Configuración"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Ventana de Depurador"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "Ventana Social"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Ventana de Emoticonos"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "Ventana de Conjuntos"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr "Ventana de la tienda"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr "Ventana de lanzamiento de objetos"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr "Ventana de Estadísticas"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr "Ventana de comandos"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr "Ventana de Chequeo de Bot"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "Ventana de Jugadores Conectados"
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "Ventana ¿Sabías que.."
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr "Pestaña Social Previa"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr "Pestaña Social Siguiente"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr "Teclas de Emoticonos"
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Emoticono"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atajo para Emoticono %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr "Teclas de Conjuntos"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "Ponerse el conjunto"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr "Copiar el conjunto"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr "Copiar lo que tiene equipado a Conjunto"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr "Teclas del Chat"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Cambiar Chat"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Desplazarse hacia arriba en el chat"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Desplazarse hacia abajo en el chat"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Pestaña de Chat Anterior"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Siguiente Pestaña del Chat"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr "Cerrar la Pestaña activa del Chat"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr "Línea previa del chat"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr "Siguiente línea del chat"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr "Completar texto automáticamente en chat"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr "Desactivar entrada al Chat"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr "Otras Teclas"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr "Arriba"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr "Abajo"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr "Izquierda"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr "Derecha"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr "Movimientos locos"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr "Cambiar  el tipo de movimientos locos"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Lanzamiento de N objetos desde 0 casillas"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr "Dejar caer N artículos rápidamente"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr "Cambiar el contador de lanzamientos"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "Curar rápidamente a objetivo o a sí mismo"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr "Usar el hechizo #itenplz"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "Usar ataque mágico"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr "Intercambiar ataque mágico"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr "Intercambiar ataque pvp"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr "Cambiar tipo de maniobra"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr "Cambiar tipo de arma de ataque"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr "Cambiar tipo de ataque"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr "Cambiar modo de perseguir"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr "Cambiar modo de Imitación"
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Deshabilitar las teclas de modificación del Juego"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "Encender / Apagar audio"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Deshabilitar modo AFK"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr "Emular clic derecho desde el teclado"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr "Interruptor de tipo de cámara"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr "Tecla modificadora"
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4027,439 +4088,439 @@ msgstr ""
 "Conflicto con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
 "puede presentar un comportamiento raro."
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Fuiste eliminado por %s"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistente."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Recogiste un %d [@@%d|%s@@]."
 msgstr[1] "Recogiste unos %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
 msgstr "xp"
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
 msgstr "trabajo"
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) moverse predeterminado"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr "(I) moverse invertido"
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos locos"
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos locos"
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr "(?) movimiento desconocido"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimiento loco número %d"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr "(a) maniobra alocada personalizada"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr "(?) maniobra loca"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse al objetivo en distancia 1"
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr "(A) desplazarse al objetivo en el rango de ataque"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr "(a) rango de ataque de arquero"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?) mover al objetivo"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr "(P) seguimiento como mascota"
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr "(?) seguimiento desconocido"
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) atacar"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) ataque predeterminado"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr "(S)  intercambiar ataque con escudo"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger interesadamente a 2x3 celda"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger a 3x3 celdas"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr "(D) vista depurar del mapa"
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr "(u) ultra vista del mapa"
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra vista del mapa 2"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) vista vacía del mapa"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr "(a) atacar a todos los jugadores"
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
 msgstr "(f) atacar a todos, excepto a amigos"
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr "(b) atacar a quienes están en malas relaciones"
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
-msgstr "(d) no atacar a los jugadores"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr "(?) ataque pvp"
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de conjuntos"
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) afuera"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr "Los modificadores del juego son desconocidos"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr "Imitación: "
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr "Ves "
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opciones] [manaplus-file]"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : El archivo manaplus es un archivo XML (.manaplus)"
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr "              usado para establecer parámetros personalizados."
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr "              al cliente manaplus."
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Opciones:"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Archivo de registro a usar"
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Directorio a usar para registro del Chat"
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Muestra la versión"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Muestra la ayuda"
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Acceder con este nombre de usuario"
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Acceder con la contraseña"
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Acceder con este jugador"
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Login server o IP"
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Puerto del servidor"
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usar este host de actualización"
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Saltarse las actualizaciones"
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Carpeta por donde cargar los datos del juego"
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Carpeta donde guardar los screenshots"
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Iniciar el juego en modo seguro"
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Comenzar a probar controladores y auto configurar"
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Deshabilita OpenGL en esta sesion"
 
@@ -4698,44 +4759,44 @@ msgstr "Fuiste expulsado del clan."
 msgid "%s has kicked from your guild."
 msgstr "%s ha sido sacado de tu clan."
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invitar a un jugador a tu grupo"
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Dejar el grupo en el que estás"
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Expulsar a alguien del grupo en el que estás"
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Mostrar/Cambiar opciones para compartir objetos en el grupo"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Mostrar/Cambiar opciones para compartir experiencia en el grupo"
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 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/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr "Este comando hace que dejes el grupo."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr "Comando> /item <política>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 "Este comando cambia la política de compartición de artículos en el grupo."
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4743,26 +4804,26 @@ msgstr ""
 "<política> puede ser \"1\", \"yes\" y \"true\" para compartir artículos, o "
 "\"0\", \"no\" y \"false\" para no compartirlos."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr "Comando: /item"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Este comando muestra la política actual de compartición de artículos del "
 "grupo."
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <política>"
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 "Este comando cambia la política de compartición de experiencia del grupo."
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -4770,45 +4831,45 @@ msgstr ""
 "<política> puede ser \"1\", \"yes\" y \"true\" para compartir experiencia, o "
 "\"0\", \"no\" y \"false\" para no compartir."
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Este comando muestra la política actual de compartición experiencia del "
 "grupo."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "Compartir artículos habilitado."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "Compartir artículos deshabilitado."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "No se pueden compartir artículos."
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr "Compartir artículos desconocido."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "Compartir experiencia habilitado."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "Compartir experiencia habilitado."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr "Imposible compartir experiencia."
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr "Compartir experiencia desconocido."
 
@@ -4887,83 +4948,83 @@ msgstr "Este nombre de usuario ya está escogido."
 msgid "Username permanently erased."
 msgstr "Nombre de usuario borrado permanentemente."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "No es posible crear un grupo."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "Grupo creado."
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s se ha unido a tu grupo."
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s ya es miembro de otro grupo."
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s cancelo tu invitación."
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s ahora es un miembro de tu grupo."
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s no puede unirse a tu grupo porque está completamente lleno."
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ Respuesta desconocida a la invitación de %s."
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "Has dejado el grupo."
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s dejó tu grupo."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Un miembro desconocido intentó decir: %s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Estás muerto."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 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/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Ya no estás tan vivo."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Las manos frías de la muerte se están apoderando de tu alma."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "¡Fin del Juego!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "Inserta moneda para continuar."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4971,7 +5032,7 @@ msgstr ""
 "No, niños. Tu jugador no murió realmente. Sólo... eeeh... fue a un lugar "
 "mejor."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4979,72 +5040,72 @@ msgstr ""
 "Parece que tu plan de romper las armas de tus enemigos golpeándolas con tu "
 "garganta falló."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Creo que esto no fue muy bien."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "¿Quieres que tus posesiones sean identificadas?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Desgraciadamente, nada de ti fue encontrado..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Parece que te tiraron tu cabeza a tus manos."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "Tu no estás muerto aún... sólo estás descansando."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr "Tu ya no existes más."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr "Parece que dejaste de existir."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr "Has expirado e ido a ver al tu creador."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr "Eres un cadáver."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr "Despojado de la vida, descansas en paz."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 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:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr "Tus procesos metabólicos son ya historia."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr "Estás fuera de tus botas."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr "Te han echado a patadas."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5052,27 +5113,27 @@ msgstr ""
 "Has dejado tu cuerpo mortal, bajado las cortinas y unido al sangriento coro "
 "de los invisibles."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr "Eres un ex-jugador."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr "Estas avanzando... hacia el barranco."
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Estás cargando con más de la mitad de tu peso. Eres incapaz de recobrar la "
 "salud."
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
@@ -5662,24 +5723,24 @@ msgstr "No es posible determinar el host \""
 msgid "Connection to server terminated. "
 msgstr "Conexión al servidor terminada. "
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "¡%s no está en tu grupo!"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr "Parpadear nombre"
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr "Burbuja '...' flotante"
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr "Burbuja Flotante"
 
diff --git a/po/et.po b/po/et.po
index d4f497e86..fa6a2b746 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,340 +18,364 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Viga"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -359,23 +384,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -383,79 +409,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr ""
 
@@ -491,7 +521,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr ""
@@ -518,81 +548,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Mees"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Naine"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr ""
 
@@ -600,120 +635,122 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Vestlus"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -726,508 +763,553 @@ msgstr "Jah"
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulge"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Abi"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Järgmine"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1240,345 +1322,382 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -1622,200 +1741,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:64
-msgid "Sfx volume"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:65
-msgid "Music volume"
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1863,40 +2021,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1919,360 +2077,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr ""
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2288,408 +2546,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2697,502 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Raha: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3216,26 +3144,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3243,33 +3171,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3421,23 +3349,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3502,7 +3430,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3540,6 +3469,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3669,557 +3633,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4235,142 +4515,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4404,418 +4672,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4829,160 +5093,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -4991,7 +5255,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -5000,7 +5264,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5009,7 +5273,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5018,7 +5282,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5288,41 +5552,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5330,129 +5594,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/fa.po b/po/fa.po
index 7ebe1b6cb..7744ef2d5 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,335 +18,359 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "خطا"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "چنین دستور وجود ندارد"
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "کلی"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "خطای شبکه"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -354,23 +379,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -378,79 +404,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "خروج"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "حداکثر"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "انصرا�"
 
@@ -486,7 +516,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "تغییر گذرواژه"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "گذرواژه:"
@@ -513,81 +543,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "نام"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "بساز"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "مرد"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "زن"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "نام شما حداقل باید 4 کاراکتر داشته باشد"
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "تایید می کنم که خواهان حذ� این شخصیت هستم"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "آیا اطمینان دارید که خواهان حذ� این شخصیت هستید؟"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr ""
 
@@ -595,120 +630,122 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "ثبت نام نشده"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "حذ�"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "چت"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -721,506 +758,551 @@ msgstr "بلی"
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "تایید"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "تجهیزات"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "بعدی"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1233,345 +1315,382 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -1615,200 +1734,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:64
-msgid "Sfx volume"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:65
-msgid "Music volume"
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1856,40 +2014,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1912,360 +2070,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr ""
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2281,408 +2539,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2690,502 +2981,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3209,26 +3137,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3236,33 +3164,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "در حال اتصال..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3414,23 +3342,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3495,7 +3423,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3533,6 +3462,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3662,556 +3626,872 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4227,142 +4507,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4396,418 +4664,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4821,160 +5085,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -4983,7 +5247,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -4992,7 +5256,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5001,7 +5265,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5010,7 +5274,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5280,41 +5544,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5322,129 +5586,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/fi.po b/po/fi.po
index c09731088..a89605dbf 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-05 23:09+0000\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fi\n"
@@ -19,69 +19,73 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "väistö"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "-"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Tehokkuus"
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Kuva"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr "Teemat"
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -91,63 +95,63 @@ msgstr "Vaihdan pelipalvelinta"
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -156,160 +160,160 @@ msgstr ""
 "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
 "käytit omaa nimeäsi."
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Pyyntö liittyä kanavalle %s lähetetty."
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Ryhmän nimi puuttuu."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "Killan nimi puuttuu."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Nyt viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "ystävä"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "vaimennettu"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "neutraali"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "Pelaaja on jo %s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pelaaja on nyt %s."
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "Pelaaja huomioidaan taas."
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr "mustalistattu"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr "vihollinen"
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "Pelaaja on jo pyyhitty!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "Pelaaja pyyhitty."
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d viikon"
 msgstr[1] "%d viikkoa"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivän"
 msgstr[1] "%d päivää"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunnin"
 msgstr[1] "%d tuntia"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutin"
 msgstr[1] "%d minuuttia"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunnin"
 msgstr[1] "%d sekuntia"
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "kirjasinvälimuistin koko"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr "Välimuistin koko:"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "Luotu:"
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "Poistettu:"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
@@ -320,11 +324,11 @@ msgstr ""
 "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
 "\"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "Debug"
 
@@ -385,18 +389,18 @@ msgstr "Kommentti: %s"
 msgid "Bot Checker"
 msgstr "Bottitutka"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Nimi"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Hyökkää"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Keskustele"
 
@@ -434,7 +438,7 @@ msgstr "Määrä:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -442,25 +446,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Sulje"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Kauppa"
 
@@ -484,8 +488,8 @@ msgstr "Myy"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Peru"
@@ -658,8 +662,8 @@ msgid "Enter password:"
 msgstr "Salasana:"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Poista"
 
@@ -677,6 +681,7 @@ msgid "(empty)"
 msgstr "(tyhjä)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "oletus"
 
@@ -734,24 +739,23 @@ msgstr "sateenkaari 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
@@ -775,7 +779,7 @@ msgid "Ignore"
 msgstr "Ohita"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Kartta"
 
@@ -850,62 +854,76 @@ msgstr "Tekstuurien määrä:"
 msgid "Particle count: %d"
 msgstr "Hiukkasluku: %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Kohde:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "Kohteen tunniste:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
-msgstr "Kohteen taso:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
-msgstr "Kohteen ryhmä:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
-msgstr "Kohteen kilta:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "Hyökkäysviive:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr "Minimivahinko:"
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr "Maksimivahinko:"
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr "Kriittinen osuma:"
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Kohteen taso:"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Kohteen ryhmä:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Kohteen kilta:"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Sisään: %d tavua/s"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Ulos: %d tavua/s"
@@ -932,8 +950,8 @@ msgstr "Seuraava >"
 msgid "Auto open this window"
 msgstr "Avaa tämä ikkuna automaattisesti"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
@@ -1045,7 +1063,7 @@ msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Varastoi"
 
@@ -1104,91 +1122,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Paino: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Tappotilastot"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "Nollaa tiedot"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "Nollaa ajastin"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Taso: %d @ %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Kokemus: %d/%d, jäljellä: %d"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d kp, keskim. vastustajaa 1%%:iin: %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Tappoja: %s, kp kaikkiaan: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Keskim. kp: %s, Keskim. vastustajaa seur. tasoon: %s"
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Tappoa/min: %s, kp/min: %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Kokemustahti / %d min: %s"
 msgstr[1] "Kokemustahti / %d min: %s<"
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Aika ensi tasolle %d min perusteella: %s"
 msgstr[1] "Aika ensi tasolle %d min perusteella: %s"
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "Viime tapon kp:"
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr "Aika jackon resetiin:"
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Aika seur. tasolle: %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr "jacko elää!"
 
@@ -1289,7 +1307,7 @@ msgid "Submit"
 msgstr "Lähetä"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
@@ -1399,7 +1417,7 @@ msgstr "Huomioi jälleen"
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -1495,7 +1513,7 @@ msgstr "Lisää ohitettavien listaan"
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Pelaajat"
 
@@ -1662,12 +1680,12 @@ msgstr "Näytä"
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(oletus)"
@@ -1745,25 +1763,25 @@ msgstr "Yhdistä"
 msgid "Add"
 msgstr "Lisää"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
@@ -1776,157 +1794,188 @@ msgstr "vaatii uudemman version"
 msgid "requires v%s"
 msgstr "vaatii version %s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Ääni"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Ota äänet käyttöön"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "Ota musiikki käyttöön"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "Ota pelin äänitehosteet käyttöön"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "Ota käyttöliittymän äänitehosteet käyttöön"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "Ota musiikki käyttöön"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "Ota muminaäänikeskustelu käyttöön"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "Lataa musiikki"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Ääni"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Äänitehosteiden voimakkuus"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Musiikin voimakkuus"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Huomaa"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
-"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet "
-"musiikit"
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Äänimoottori"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "Muu"
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "Ota muminaäänikeskustelu käyttöön"
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "Lataa musiikki"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Värit"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Poista värit saapuneista keskusteluviesteistä"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Näytä keskustelun värilista"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "Komennot"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Salli magia ja GM-komennot kaikilla keskusteluvälilehdillä"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "Rajat"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Keskusteluviestin pituusraja"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Keskusteluvälilehden riviraja"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "Lokit"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "Kirjaa keskustelut"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Näytä keskusteluhistoria"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "Viestit"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Piilota kauppaviestit"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "Välilehdet"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Laita kaikki kuiskaukset välilehtiin"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "Kirjaa magiaviestit debug-välilehdelle"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Näytä palvelinviestit debug-välilehdellä"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "Ota kaupankäyntivälilehti käyttöön"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "Ota taisteluvälilehti käyttöön"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "Näytä taistelutapahtumat"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr "Muuta välilehden kokoa tarpeen mukaan"
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "Aika"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "Käytä paikallista aikaa"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "Muu"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr "Korosta sanat (pilkuin erotettu)"
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr "Näytä MVP-viestit"
 
@@ -1977,41 +2026,41 @@ msgstr "Sininen:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Hyväksy"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Kalibroi"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Ota peliohjain käyttöön"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr "Käytä peliohjainta jos asiakasikkuna ei ole aktiivinen"
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Peliohjain"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Lopeta"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
-msgstr "Pyöritä ohjainta, älä paina nappeja"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2033,457 +2082,461 @@ msgstr "Oletus"
 msgid "Key Conflict(s) Detected."
 msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "Sekal."
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Hirviöt"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Näytä hirviön saama vahinko"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "Valikoi kohteiksi vain saavutettavia hirviöitä"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Korosta hirviön hyökkäyskantama"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "Näytä hirviön vp-palkki"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "Vaihda hirviökohteita syklissä"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr "Näytä siirtymissä hiukkastehoste"
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "Korosta karttasiirtymät"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Korosta maassa olevat tavarat"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Korosta pelaajan hyökkäyskantama"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr "Näytä parannellut minikartat"
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "Piirrä polku"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr "Piirrä siirtymäpikanäppäimet kartalle"
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr "Ota laiska vieritys käyttöön"
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr "Vierityksen laiskuus"
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr "Vierityksen säde"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "Liikkuminen"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "Korjaa sijainti automaattisesti"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "Hyökkää liikkuessa"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "Synkronoi pelaajan liikkeet"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "Villiliike (a) -ohjelma"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "Pelaaja"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Näytä oma vp-palkki"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "Ota pikatilastot käyttöön"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "Vaihda pelaajakohteita syklissä"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "Näytä työkokemusviestit"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "Näytä pelaajaponnahdusikkunat"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr "Poissaoloviesti"
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "Näytä työ"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr "Ota käyttöön hyökkäyssuodin"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr "Ota käyttöön mainosprotokolla"
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Salli osta/myy-pyynnöt"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "Ota kauppatila käyttöön"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr "Bottien tuki"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr "Ota käyttöön huutokauppabotin tuki"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ota käyttöön kiltabottien tuki ja poista sisäinen kiltatuki käytöstä"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr "Ota käyttöön palvelinpuolen hyökkäys"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Ota bottitutka käyttöön"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Ota käyttöön bugisten palvelinten suojaus (älä poista käytöstä)"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "Ota käyttöön debug-loki"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "Matalan liikenteen tila"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr "Piilota kilpihahmo"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Näytä tausta"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Ota lisätehot käyttöön ;)"
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr "Sopeuta tehokkuusasetukset automaattisesti"
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "Rautakiihdytys"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 "Ota käyttöön läpinäkyvyysvälimuisti (ohjelmallinen, voi olla muistisyöppö)"
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr "Ota käyttöön karttareduktio (ohjelmallinen)"
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr "Parempi laatu (poista käytöstä jos tarvitset lisätehoa)"
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Ota käyttöön alfakanavan korjaus (ohjelmallinen, voi olla hidas)"
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr "Näytä olioiden läpinäkyvyys"
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr "Ota käyttöön uudelleenjärjestyshahmot"
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Pieni muisti, käytä vähemmän muistia"
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr "Poista kehittynyt olentojen välimuisti käytöstä (ohjelmallinen)"
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr "Poista olentojen välimuisti käytöstä (ohjelmallinen)"
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Näytä sukupuoli"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Näytä taso"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Näytä oma nimi"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr "Ota käyttöön laajennettu kohteen valinta hiirellä"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "Ota kuolleetkin pelaajat kohteiksi"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Näytä nimet"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr "Turvaa kaupat"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr "Turvattomia merkkejä nimissä"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr "Näytä tilat"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr "Näytä IP-osoitteet kuvakaappauksissa"
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr "Salli itsen parantaminen hiiren napsautuksella"
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relaatio"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutraali"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Ystävä"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Vaimennettu"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Huomiotta jätetty"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Pyyhitty"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr "Mustalla listalla"
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr "Vihollinen"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Salli kaupakäynti"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Salli kuiskaukset"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Vanha"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "Suhteet"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Kun jätät huomiotta:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Pikkiriikkinen (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Pieni (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Keskikokoinen (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Kookas (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Suuri (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Jättimäinen (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr "Kiina (kiina)"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr "Tsekki"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr "Englanti"
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr "Suomi"
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr "Ranska"
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr "Saksa"
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr "Indonesia"
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr "Puola"
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr "Japani"
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Hollanti (Belgia/fleemi)"
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr "Portugali (Brasilia)"
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr "Venäjä"
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr "Espanja (Kastilli)"
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Teema"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "Käyttöliittymän teema"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr "Kieli"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "Pääkirjasin"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Lihavoitu kirjasin"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "Hiukkaskirjasin"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "Ohjekirjasin"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr "Turvallinen kirjasin"
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr "Japanilainen kirjasin"
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Ulkoasua muutettu"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
@@ -2499,157 +2552,163 @@ msgstr "Nopea OpenGL"
 msgid "Safe OpenGL"
 msgstr "Turvallinen OpenGL"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Ei tekstiä"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Teksti"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Puhekuplat, ei nimiä"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Puhekuplat nimillä"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "pois päältä"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "matala"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "korkea"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "keskitaso"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "maksimi"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Hiukkastehosteet"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Näytä poimintaviesti"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "keskusteluikkunassa"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "leijuvana"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "Piirtonopeusrajoitin (FPS):"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "Vaihtoehtoinen FPS-rajoitin:"
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr "Tekstinä yläpuolella"
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "Käyttöliittymän läpinäkyvyys"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "Taustaäänet"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "Hiukkastehosteiden yksityiskohtaisuus"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "-"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Vaihdan kokoruututilaan"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Oma tarkkuus (esim. 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "Anna uusi tarkkuus:                  "
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "Ikkunan koko vaihdettu"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "Hiukkastehosteiden asetuksia on muutettu."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Käyttöliittymän läpinäkyvyys"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Ei tekstiä"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Teksti"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Puhekuplat, ei nimiä"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Puhekuplat nimillä"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Tekstinä yläpuolella"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "pois päältä"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "matala"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "korkea"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Taustaäänet"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Hiukkastehosteet"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "keskitaso"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "maksimi"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2732,7 +2791,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "Taso: %d (%+d)"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Kilta"
 
@@ -2764,7 +2823,7 @@ msgstr "Eroa killasta?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti erota killasta %s?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Ryhmä"
 
@@ -2936,139 +2995,139 @@ msgstr "Anna ryhmällesi nimi."
 msgid "Specials"
 msgstr "Erikoisuudet"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Rahat: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "VP:"
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Kok:"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Työ: %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Työ:"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr "Hahmopisteitä: %d"
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Taso: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr "Korjauspisteitä: %d"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Ei kohdetta"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "Salli kohde"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "Tarvitsee kohteen"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Yleismagia"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Elämämagia"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Sotamagia"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Muovausmagia"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Luontomagia"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "Astraalimagia"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "Komentomuokkain"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "muu"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "Symboli:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Komento:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr "Kommentti:"
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Kohdetyyppi:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "Kuvake:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Magiataso:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "Magian koulukunta:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "Koulukunnan taso:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Tallenna"
 
@@ -3296,7 +3355,7 @@ msgstr "Kotipaikan raja"
 msgid "Road Point"
 msgstr "Väyläpiste"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
@@ -3304,15 +3363,15 @@ msgstr "Kuka on linjoila - päivitän"
 msgid "Update"
 msgstr "Päivitä"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -3377,8 +3436,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Tämä komento tekee annetunnimisestä käyttäjästä kanavaoperaattorin."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jos nimessä on välilyöntejä, laita sen ympärille lainausmerkit (\")."
 
@@ -3418,38 +3477,38 @@ msgstr "%s ilmoittaa kaikille:"
 msgid "%s whispers: %s"
 msgstr "%s kuiskaa: %s"
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr "Komento: /invite <nimi>"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Tämä komento kutsuu annetun pelaajan nykyiseen kiltaasi."
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr "Komento: /leave"
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr "Tämä komento saa sinut eroamaan killasta."
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr "/help > Näytä tämä ohje."
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Kutsu pelaaja kiltaasi"
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Eroa nykyisestä killastasi"
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Poista käyttäjä killastasi"
 
@@ -3592,427 +3651,427 @@ msgstr "Varasto"
 msgid "Cart"
 msgstr "Kärry"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr "Perusnäppäimet"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Ylöspäin"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Alaspäin"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Vasemmalle"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Oikealle"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Kohdista ja hyökkää"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "Mene kohteen luo"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "Muuta kohteen luo liikkumisen tyyppiä"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr "Siirry kotipaikkaan"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr "Aseta kotipaikka"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr "Siirry reittipisteeseen"
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Keskeytä hyökkäys"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr "Poista kohdevalinta"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "Lähin kohteeksi"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "NPC kohteeksi"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Pelaaja kohteeksi"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Poimi"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "Muuta poiminnan tyyppiä"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Piilota ikkunat"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Istu"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Kuvankaappaus"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Salli/estä kaupankäynti"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "Vaihda karttanäkymää"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "Valitse OK"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr "Pikavalintanäppäimet"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr "Tavaroiden pikavalintanäppäin"
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Tavarapikavalinta %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr "Ikkunanäppäimet"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Ohjeikkuna"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Tilaikkuna"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Tavaraikkuna"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Varusteikkuna"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Taitoikkuna"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Karttaikkuna"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Keskusteluikkuna"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Tavaroiden pikavalintaikkuna"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Asetusikkuna"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Debug-ikkuna"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "Suhdeikkuna"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Eleiden pikavalintaikkuna"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "Asukokonaisuusikkuna"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr "Kauppaikkuna"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr "Pikapudotusikkuna"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr "Tappotilastoikkuna"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr "Komentoikkuna"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr "Bottitutkaikkuna"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "Kuka on linjoilla -ikkuna"
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "Tiesitkö-ikkuna"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr "Edellinen sos. välilehti"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr "Seuraava sos. välilehti"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr "Elenäppäimet"
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Hymiö"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Eleen pikavalinta %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr "Asunäppäimet"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "Pue asu"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr "Kopioi asu"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr "Kopioi varusteet asuksi"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr "Keskustelunäppäimet"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Ota keskustelu käyttöön/pois käytöstä"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Vieritä keskustelua ylös"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Vieritä keskustelua alas"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Edellinen keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Seuraava keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr "Sulje tämä keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr "Edellinen keskustelulinja"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr "Seuraava keskustelulinja"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr "Sarkaintäydennys keskustelussa"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr "Poistu keskustelusyötöstä"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr "Muut näppäimet"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Jätä huomiotta syöte 1"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Jätä huomiotta syöte 2"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr "Vie ylös"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr "Vie alas"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr "Vie vasemmalle"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr "Vie oikealle"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr "Villiliikkeet"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr "Muuta villiliiketilaa"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Pudota nopeasti N esinettä paikasta 0"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr "Pudota nopeasti N esinettä"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr "Vaihda nopean pudotuksen laskuria"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "Pikaparanna kohde tai itse"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr "Käytä #itenplz-loitsua"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "Käytä magiahyökkäystä"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr "Vaihda magiahyökkäystä"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr "Vaihda PvP-hyökkäystä"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr "Vaihda liikkumistyyppiä"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr "Vaihda hyökkäysaseen tyyppiä"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr "Vaihda hyökkäystyyppiä"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr "Vaihda seuraustyyliä"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr "Vaihda matkintatyyliä"
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr "Ota käyttöön / poista pelimuokkaimet"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "Äänet päälle / pois"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "Aseta / peru poissaolo"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr "Kontekstivalikkoon \"klikkaus\" näppäimistöltä"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr "Vaihda kameran toimintaa"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr "Muokkausnäppäin"
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4021,439 +4080,439 @@ msgstr ""
 "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
 "ole hyvä ja poista päällekkäisyydet. "
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Sinut tappoi %s."
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit poimia olemattoman tavaran."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran poimimisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr "(?) tuntematon liikkumistapa"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) villiliike nro %d"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr "(a) jousiampujan hyökkäyskantama"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) mene, hyökkää, poimi"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pieni poiminta 1x1 ruutua"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) oletuspoiminta 2x1 ruutua"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) poiminta edestä 2x3 ruutua"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) poiminta 3x3 ruutua"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) mene ja poimi etäisyydellä 4"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) mene ja poimi etäisyydellä 8"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr "(A) mene ja poimi maksimietäisyydellä"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?) poiminta"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) tyhjä karttanäkymä"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr "(a) hyökkää kaikkien pelaajien kimppuun"
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr "(b) hyökkää jos huonot suhteet"
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
-msgstr "(d) älä hyökkää pelaajien kimppuun"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr "(?) pelaajien kanssa taistelu"
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) poissa"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr "Pelimuokkaimet ovat tuntemattomia"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr "Näet "
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [asetukset] [manaplus-tiedosto]"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-tiedosto] : Manaplus-tiedosto on XML-tiedosto (.manaplus)"
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr "                  jolla asetetaan erikoisvalitsimia"
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr "                  manaplus-ohjelmalle."
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Asetusvivut:"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Käytettävä lokitiedosto"
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Käytettävä keskustelulokihakemisto"
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Näytä versionumero"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Näytä tämä ohje"
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Käytä tätä asetushakemistoa"
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Käyttäjätunnus sisäänkirjautumiseen"
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Salasana sisäänkirjautumiseen"
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 "  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Palvelinportti sisäänkirjautumiseen "
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Käytä tätä päivityspalvelinta"
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Aseta oletushahmopalvelin ja -hahmo"
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Ohita päivityslataukset"
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Lataa pelidata tästä hakemistosta"
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Hakemisto paikallisdatan tallennukseen"
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Kuvankaappausten tallennushakemisto"
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Käynnistä peli vikasietotilassa"
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr "  -T --tests          : Käynnistä ajuritestaus ja automaattiasetukset"
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Poista OpenGL käytöstä tämän session ajaksi"
 
@@ -4690,43 +4749,43 @@ msgstr "Sinut potkittiin ulos killasta."
 msgid "%s has kicked from your guild."
 msgstr "%s on potkittu ulos killastasi."
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Kutsu pelaaja ryhmääsi"
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Eroa nykyisestä ryhmästäsi"
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Potki pelaaja ryhmästäsi"
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Näytä/muuta ryhmän tavaranjaon asetuksia"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Näytä/muuta ryhmän kokemuksenjaon asetuksia"
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr "Tämä komento kutsuu annetun pelaajan ryhmääsi."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr "Tämä komento erottaa pelaajan ryhmästä."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr "Komento: /item <jakopolitiikka>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr "Tämä komento muuttaa ryhmän saaliinjakopolitiikkaa."
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4734,23 +4793,23 @@ msgstr ""
 "<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin "
 "saalis jaetaan, tai \"0\", \"no\" tai \"false\", jolloin saalista ei jaeta."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr "Komento: /item"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr "Tämä komento näyttää ryhmän nykyisen saaliinjakopolitiikan."
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr "Komento: /exp <jakopolitiikka>"
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr "Tämä komento muuttaa ryhmän kokemuksenjaon politiikkaa."
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -4759,43 +4818,43 @@ msgstr ""
 "kokemuspisteet jaetaan, tai \"0\", \"no\" tai \"false\", jolloin "
 "kokemuspisteitä ei jaeta."
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr "Komento: /exp"
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Tämä komento näyttää ryhmän nykyisen kokemuksenjaon politiikan."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "Saaliinjako käytössä."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "Saaliinjako poistettu käytöstä."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "Saaliinjako ei ole mahdollista."
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr "Saaliinjaon tila on tuntematon."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "Kokemuksen jako käytössä."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "Kokemuksen jako pois käytöstä."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr "Kokemuksen jako ei ole mahdollista."
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr "Kokemuksen jaon tila on tuntematon."
 
@@ -4873,83 +4932,83 @@ msgstr "Käyttäjätunnus on jo käytössä."
 msgid "Username permanently erased."
 msgstr "Käyttäjänimi pysyvästi poistettu."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Ryhmän luonti epäonnistui."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "Ryhmä luotu."
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s on liittynyt ryhmääsi."
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s kuuluu jo johonkin ryhmään."
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s ei ottanut kutsuasi vastaan."
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s on nyt ryhmäsi jäsen."
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s ei voi liittyä ryhmääsi, koska se on täynnä."
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ Tuntematon kutsuvastaus kohteella %s."
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "Erosit ryhmästä."
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s on eronnut ryhmästä."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Tuntematon jäsen yritti sanoa: %s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Olet kuollut."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Ikävä kyllä joudumme kertomaan hahmosi kuolleen taistelussa."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Et ole enää erityisen elossa."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Tuonelasta käy sieluusi kylmä viima."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Se siitä!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "Syötä kolikko jatkaaksesi."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4957,7 +5016,7 @@ msgstr ""
 "Ei, lapsikullat. Hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
 "paikkaan."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4965,72 +5024,72 @@ msgstr ""
 "Ovela suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
 "epäonnistui."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Ei tainnut mennä kovin lujaa."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Haluatko tietää mitä rojua kanniskelit oikeasti mukanasi?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Ikävä kyllä sinusta ei jäänyt lopulta jälkeäkään löydettäväksi..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Pim! Olet annihiloitu."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Jäi näköjään oma pää vetävän käteen."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Peballeen meni taas, vedä raatosi vessasta alas ja hanki uusi."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "Et ole kuollut vielä, lepäät vain."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr "Olet lakannut olemasta."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr "Olet kuollut kuin päivänkakkaraa pukkaava ex-papukaija."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr "Olet lähtenyt moikkaamaan luojaasi."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr "Raato mikä raato."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr "Olet eloton, mutta lepäät rauhassa."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Ellet olisi näin liikkuvainen, pukkaisit päivänkakkaraa."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr "Aineenvaihduntaprosessisi ovat historiaa."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr "Olet lopultakin nakkisuojassa."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr "Potkaisit tyhjää."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5038,25 +5097,25 @@ msgstr ""
 "Olet heittänyt henkesi, poistunut keskuudestamme ja loikannut Tuonelan "
 "jokeen."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr "Olet entinen pelaaja."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr "Kaipaat kotivuonoille."
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "Viesti"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 
@@ -5645,24 +5704,24 @@ msgstr "Osoitetta ei löydy: \""
 msgid "Connection to server terminated. "
 msgstr "Yhteys palvelimeen katkaistu. "
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s ei ole ryhmässäsi!"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr "Tulosta '...'"
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr "Vilkuta nimeä"
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr "Leijuva '...' -puhekupla"
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr "Leijuva puhekupla"
 
diff --git a/po/fr.po b/po/fr.po
index c25cc010e..185abfd7c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <antoinebcn@hotmail.com>, 2011.
-# Bernard  <nard@bh28.net>, 2011.
+# Bernard  <nard@bh28.net>, 2011, 2012.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
 #   <reidyaro@gmail.com>, 2011, 2012.
 # Steel Style <steelstyle@free.fr>, 2012.
@@ -13,10 +13,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-05 23:09+0000\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
+"Language-Team: French (http://www.transifex.net/projects/p/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -24,69 +24,73 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr "Humain"
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "esquivé"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr "Thèmes"
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -96,64 +100,64 @@ msgstr "Changement de serveur de jeu"
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 "Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Vous ne pouvez pas envoyer de messages vides."
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -162,161 +166,161 @@ msgstr ""
 "Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
 "\". Soit elle existe déjà, soit il s'agit de vous même."
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Demande de rejoindre le canal %s."
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Le nom du groupe est manquant."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "Le nom de la guilde est manquant."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Veuillez indiquer un nom."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Le message ferme la conversation."
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 "La touche <entrée> ferme maintenant la ligne d'entrée de la conversation."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Le message ferme maintenant la conversation."
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "ami"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "écarté"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "neutre"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur  %s avec succès!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr "sous liste noire"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr "ennemi"
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "Joueur éliminé avec succès !"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "le joueur n'a pas pu être effacé !"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semaine"
 msgstr[1] "%d semaines"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d jour"
 msgstr[1] "%d jours"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d heure"
 msgstr[1] "%d heures"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minute"
 msgstr[1] "%d minutes"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d secondes"
 msgstr[1] "%d secondes"
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "Taille du cache de polices"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr "Dimension du cache :"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "Créé : "
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "Effacé :"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
@@ -326,11 +330,11 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Général"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "Informations"
 
@@ -392,18 +396,18 @@ msgstr "Commentaire : %s"
 msgid "Bot Checker"
 msgstr "Testeur de Robot"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Nom"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Attaquer"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Parler"
 
@@ -441,7 +445,7 @@ msgstr "Montant:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -449,25 +453,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Quitter"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Boutique"
 
@@ -491,8 +495,8 @@ msgstr "Vendre"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Annuler"
@@ -665,8 +669,8 @@ msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -684,6 +688,7 @@ msgid "(empty)"
 msgstr "(vide)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "défaut"
 
@@ -741,24 +746,23 @@ msgstr "arc en ciel 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message envoyé à %s : %s"
@@ -782,7 +786,7 @@ msgid "Ignore"
 msgstr "Ignorer"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Carte"
 
@@ -857,62 +861,76 @@ msgstr "Comptage des trames :"
 msgid "Particle count: %d"
 msgstr "Effets de particules : %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Cible :"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "Id de la Cible :"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
-msgstr "Cibler un niveau :"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr "Niveau de la cible :"
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
-msgstr "Cibler un groupe :"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr "Race de la cible :"
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
-msgstr "Cibler une guilde :"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr "Groupe de la cible :"
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr "Guilde de la cible :"
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "Délai d'attaque :"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr "Coup Mini :"
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr "Coup Max :"
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr "Coup Critique :"
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Cibler un niveau :"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Cibler un groupe :"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Cibler une guilde :"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrée : %d bytes/s"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Sortie : %d bytes/s"
@@ -939,8 +957,8 @@ msgstr "Suivant >"
 msgid "Auto open this window"
 msgstr "Ouverture automatique de cette fenêtre"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
@@ -951,7 +969,7 @@ msgstr "Editer le Serveur"
 
 #: src/gui/editserverdialog.cpp:62
 msgid "Address:"
-msgstr "Addresse :"
+msgstr "Adresse :"
 
 #: src/gui/editserverdialog.cpp:63
 msgid "Port:"
@@ -967,7 +985,7 @@ msgstr "Description :"
 
 #: src/gui/editserverdialog.cpp:175
 msgid "Please at least type both the address and the port of the server."
-msgstr "S'il te plait, entres la bonne adresse et le bon port du serveur."
+msgstr "S'il vous plait, entrez l'adresse et le port du serveur."
 
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
@@ -1052,7 +1070,7 @@ msgstr "Poids :"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Entreposer"
 
@@ -1111,91 +1129,91 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Poids : %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Statistiques"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "RaZ stats"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "RaZ temps"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Niveau : %d à %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp : %d/%d Reste : %d"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d Moyenne des monstres tués 1%% : %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Nbre Tués : %s, total exp : %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Moyenne Exp: %s, Nombre de monstres pour le prochain niveau : %s"
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Tués/Min : %s, Exp/Min : %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Rapidité exp pour %d min : %s"
 msgstr[1] "Rapidité exp pour %d min : %s"
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Temps pour le prochain niveau %d min : %s"
 msgstr[1] "Temps pour le prochain niveau %d min : %s"
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "Exp du dernier tué :"
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr "Temps avant l'arrivée de Jack0 :"
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Temps pour le prochain niveau : %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr "Arrivée de Jack0"
 
@@ -1296,7 +1314,7 @@ msgid "Submit"
 msgstr "Soumettre"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "PNJ"
 
@@ -1370,7 +1388,7 @@ msgstr "Éviter"
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
 #: src/gui/popupmenu.cpp:717
 msgid "Black list"
-msgstr "Liste noir"
+msgstr "Liste noire"
 
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
@@ -1406,7 +1424,7 @@ msgstr "Ne plus ignorer"
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -1502,7 +1520,7 @@ msgstr "Ajouter à la liste d'ignorés"
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la boite de dialogue"
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Joueurs"
 
@@ -1530,11 +1548,11 @@ msgstr "Enlever"
 
 #: src/gui/popupmenu.cpp:574
 msgid "Warp"
-msgstr "Télétransportation"
+msgstr "Téléportation"
 
 #: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
-msgstr "Nettoyer les tenues"
+msgstr "Effacer la tenue"
 
 #: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1669,12 +1687,12 @@ msgstr "Montrer"
 msgid "Reset yellow bar"
 msgstr "Remise aux valeurs de défaut de la barre jaune"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(défaut)"
@@ -1752,25 +1770,25 @@ msgstr "Connexion..."
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Éditer"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveur !"
 
@@ -1783,156 +1801,188 @@ msgstr "requiert une nouvelle version"
 msgid "requires v%s"
 msgstr "requiert la v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Activer le son"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "Activer la musique"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "Activer les effets sonores du jeu"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "Activer les effets spéciaux de l'interface"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "Activer la musique"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "Activer le chat avec mumble"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "Télécharger la musique"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Audio"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Volume des effets sonores"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Volume de la musique"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
-"Le client devra être redémarré si vous téléchargez une nouvelle musique."
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Moteur de son"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "Autre"
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "Activer le chat avec mumble"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "Télécharger la musique"
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Retirer les couleurs des messages de chat"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Montrer la liste des couleurs de chat"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "Commandes"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Messages de magie et commandes GM dans tous les onglets du chat"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "Limites"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Limiter le nbre max de car d'une ligne de discussion"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Limiter le nbre max de lignes dans le chat"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "Enregistrements"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "Activer l'enregistrement des conversations"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Afficher l'historique de discussion"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "Messages"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Masquer les messages liés à la boutique"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "Fenêtre"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Placer tous les messages privés dans des onglets"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "Messages de magie dans l'onglet \"informations\""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Afficher les messages du serveur dans l'onglet \"informations\""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "Activer la boite de dialogue d'échanges"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "Activer l'onglet de combat"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "Afficher les événements de combat"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr "Si besoin est, changer la taille des fenêtre de dialogue"
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "Temps"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "Utiliser l’horaire local"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "Autre"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr "Mots en surbrillance (séparés par une virgule)"
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr "Montrer les messages MVP"
 
@@ -1983,41 +2033,41 @@ msgstr "Bleu : "
 msgid "Alpha:"
 msgstr "Opacité : "
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Presser le bouton pour démarrer la calibration"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Calibrer"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Activer la manette de jeu"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
-msgstr "Continuer d'utiliser le joystick si la fenêtre est minimisée."
+msgstr "Utiliser le joystick si la fenêtre est au second plan."
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Manette"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Stop"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
-msgstr "Tournez le manche et n'appuyer pas sur les boutons"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2039,458 +2089,463 @@ msgstr "Par défaut"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflit(s) de touche détecté(s)"
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "Divers"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstres"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Montrer les dégâts infligés aux monstres"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "Ne viser en auto que les monstres à portée de tir "
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Afficher la portée d'attaque des monstres"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "Afficher la barre de vie des monstres"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "Sélectionner les monstres par ordre de distance"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr "Montrer les effets de déplacement"
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "Afficher les portails de changement de carte"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Mettre en évidence les items sur le sol"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Afficher la portée d'attaque du joueur"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr "Montrer les mini cartes étendues"
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "Afficher le chemin"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr "Afficher les touches-raccourcis sur la carte"
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr "Activer le défilement paresseux"
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr "Paresse de défilement"
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr "Rayon de défilement"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "En mouvement"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "Auto-correction de position"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "Attaquer en bougeant"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "Synchroniser les mouvements du joueur"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "Programme A de mouvement de fou"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "Joueur"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Afficher votre propre barre de vie"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "Activer les statistiques instantanées"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "Sélectionner les joueurs par ordre de distance"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "Afficher les expériences de compétences"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "Afficher les pop-ups des joueurs"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr "Message d'absence"
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "Afficher les compétences"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr "Activer le mode attaque"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr "Lancer le protocole d'avertissements"
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Accepter les requêtes d'achat et de vente"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "Activer le mode boutique"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "Enregistrer les conversations des PNJ"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
-msgstr "Aide de bots"
+msgstr "Support des bots"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
-msgstr "Activer le bot d'enchère"
+msgstr "Activer le bot d'enchères"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Activer le bot de guilde et désactiver le support par défault"
+msgstr ""
+"Activer le support du bot de guilde et désactiver le support par défault"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr "Activer l'attaque de la part du serveur"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Activer le testeur de robots"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Active la protection pour serveurs defaillant (ne pas désactiver)"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "Activer l'enregistrement des informations"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "Mode traffic faible"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr "Cacher le bouclier"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Montrer le fond"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
-msgstr "Meilleure Performance (Autoriser une meilleure performance)"
+msgstr "Meilleure Performance (autoriser pour une meilleure performance)"
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr "Ajustement automatique des performances"
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "Accélération matériel"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 "Autoriser l'opacité du cache (Le programme peut utiliser beaucoup de mémoire)"
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
-msgstr "Autoriser la réduction des cartes (Programme)"
+msgstr "Autoriser la réduction des cartes (Logiciel)"
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
-msgstr "Meilleure qualité (quitter pour une meilleure performance)"
+msgstr "Meilleure qualité (désactiver pour une meilleure performance)"
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 "Autoriser les correction des champs alpha ( Programme, cela peut être lent)"
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
-msgstr "Montrer les êtres en transparence"
+msgstr "Montrer les créatures en transparence"
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr "Autoriser la réorganisation des cartes éléments de dessin"
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
-msgstr "Petite mémoire (autoriser pour une utilisation faible de la mémoire)"
+msgstr "Petite mémoire (autoriser pour une utilisation moindre de la mémoire)"
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
-msgstr "Disable advanced beings caching (Software)"
+msgstr "Désactiver la mise en cache des créatures avancées (logiciel)"
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
-msgstr "Désactiver la mise en cache des êtres"
+msgstr "Désactiver la mise en cache des créatures"
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Afficher le genre"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Afficher le niveau"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Afficher son propre nom"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
-msgstr "Activer la souris suplémentaire lors du ciblage"
+msgstr "Activer le mode de visée étendu de la souris"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "Cibler les joueurs morts"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Afficher les noms"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr "Protection des échanges"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr "Caractère à risque dans le nom"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
-msgstr "Montrer les Status"
+msgstr "Montrer les Statuts"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
-msgstr "Afficher les adresses ip sur les photos d'écran"
+msgstr "Afficher les adresses ip sur les captures d'écran"
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr "Autoriser la récupération automatique sur clic droit de la souris"
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr "Regrouper les amis dans la fenêtre de qui est en ligne"
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutre"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Ami"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Négligé"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignoré"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Effacé"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
-msgstr "Sous liste noir"
+msgstr "Sous liste noire"
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr "Ennemi"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Autoriser les échanges"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Autoriser les messages privés"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Ancien"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "Relations"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Quand ignoré :"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Minuscule (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Petite (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Moyenne (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Grande (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Grand (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Immense (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr "Chinois (Chine)"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr "Tchèque"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr "Anglais"
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr "Finnois"
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr "Français"
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr "Allemand"
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr "Indonésien"
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr "Polonais"
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr "Japonais"
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
-msgstr "Néerlandais (Belgique / Flandre)"
+msgstr "Néerlandais (Belgique / Flamand)"
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr "Portugais (Brésilien)"
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr "Russe"
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr "Espagnol (Castillan)"
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Thème"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "Thème de l'interface"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr "Langue"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "Police principale"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Police grasse"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "Taille des effets de particules"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "Police de l'aide"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr "Police sécurisée"
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr "Police japonaise"
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Taille de police"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Thème changé"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarrez le jeu pour que les changements soient appliqués."
 
@@ -2506,164 +2561,170 @@ msgstr "Open GL rapide."
 msgid "Safe OpenGL"
 msgstr "OpenGL sécurisé"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Pas de texte"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Texte"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Bulles sans noms"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Bulles avec noms"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "aucun"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "léger"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "élevé"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "moyen"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Effets de particules"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Afficher les messages de ramassage"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "dans la conversation"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "avec des particules"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
-msgstr "Activer la redimension"
+msgstr "Activer le redimensionnement"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr "Pas d'image"
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "Limite FPS :"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "Alterner les limites FPS"
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr "Texte aérien"
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "Opacité de l'interface"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "Effets ambiants"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "Détail des particules"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
-msgstr "Rien"
+msgstr "Aucun"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 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_video.cpp:500
+#: src/gui/setup_video.cpp:384
 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_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution personnalisée (Exemple : 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "Entrer la nouvelle résolution : "
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
 "réduite."
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "Paramètres d'effet de particules modifiés."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Opacité de l'interface"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Pas de texte"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Texte"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Bulles sans noms"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Bulles avec noms"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Texte aérien"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "aucun"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "léger"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "élevé"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Effets ambiants"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Effets de particules"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "moyen"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "Détail des particules"
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "Les changements seront appliqués au changement de carte."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2714,11 +2775,11 @@ msgstr "Points de compétences : %d"
 
 #: src/gui/skilldialog.cpp:385
 msgid "basic"
-msgstr ""
+msgstr "de base"
 
 #: src/gui/skilldialog.cpp:386
 msgid "Skill: basic, Id: 1"
-msgstr ""
+msgstr "Compétence: de base, Id: 1"
 
 #: src/gui/skilldialog.cpp:420
 #, c-format
@@ -2733,7 +2794,7 @@ msgstr "Compétence %d"
 #: src/gui/skilldialog.cpp:438
 #, c-format
 msgid "Skill: %s, Id: %d"
-msgstr ""
+msgstr "Compétence: %s, Id: %d"
 
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
@@ -2746,7 +2807,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "Niveau : %d (%+d)"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guilde"
 
@@ -2778,7 +2839,7 @@ msgstr "Quitter la guilde ?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Groupe"
 
@@ -2954,139 +3015,139 @@ msgstr "Choisissez le nom du groupe."
 msgid "Specials"
 msgstr "Cpt. spéciales"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "Vie :"
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp :"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "PM :"
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Métier : %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Compétences :"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr "Points de caractéristiques du personnage : %d"
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau : %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr "Points de correction : %d"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Pas de cible"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "Autoriser le ciblage"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "Nécessite une cible"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Magie générale"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Magie de Vie"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Magie de Guerre"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Magie de Transmutation"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Magie de la Nature"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "Magie Astrale"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "Éditeur de commande"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "Magie"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "Autre"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "Symbole : "
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Commande :"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr "Commentaire : "
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Mana : "
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Type de cible"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "Icône : "
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Niveau de Magie :"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "École de magie : "
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "Niveau scolaire : "
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -3157,7 +3218,7 @@ msgstr "##1 Le processus de mise à jour n'est pas achevé"
 #. TRANSLATORS: Continues "you try again later.".
 #: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
-msgstr "##1 Il est fortement recommandé que"
+msgstr "##1 Il est fortement recommandé de"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
 #: src/gui/updaterwindow.cpp:575
@@ -3170,7 +3231,7 @@ msgstr "Terminé"
 
 #: src/gui/userpalette.cpp:116
 msgid "Being"
-msgstr "Forme de vie"
+msgstr "Créature"
 
 #: src/gui/userpalette.cpp:117
 msgid "Friend Names"
@@ -3316,7 +3377,7 @@ msgstr "Limites de votre position"
 msgid "Road Point"
 msgstr "Étape"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -3324,15 +3385,15 @@ msgstr "Qui est en ligne - Mise à jour"
 msgid "Update"
 msgstr "Mise à jour"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -3399,8 +3460,8 @@ msgstr ""
 "Cette commande donne les droit d'opérateur du salon à <nom du personnage>"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "Si le <nom du personnage> contient des espaces, entourez le de guillemets "
@@ -3442,38 +3503,38 @@ msgstr "Annonce globale de %s :"
 msgid "%s whispers: %s"
 msgstr "Message de %s : %s"
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr "Commande : /invite <nom du personnage>"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr "Commande : /leave"
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr "Cette commande vous fait quitter la guilde actuelle."
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr "/help > Affiche cette aide."
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Invite un joueur à rejoindre votre guilde"
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Quitter la guilde courante"
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Éjecter quelqu'un du groupe dont vous faites partie"
 
@@ -3613,429 +3674,429 @@ msgstr "Entrepôt"
 
 #: src/inventory.cpp:253
 msgid "Cart"
-msgstr "Sac"
+msgstr "Panier"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr "Touches de base"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Monter"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Descendre"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Aller à gauche"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Aller à droite"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Viser et Attaquer"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "Aller à la cible"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "Changer le type de déplacement vers les cibles"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr "Aller à l'emplacement de base"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr "Définir l'emplacement de base"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr "Aller jusqu'au point de navigation"
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Arrêter d'attaquer"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr "Désélectionner"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "Viser le monstre le plus proche"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
-msgstr "Cibler le PNJ"
+msgstr "Sélectionner le PNJ"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Viser le Joueur"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Ramasser"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "Changer le type de ramassage"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Cacher les fenêtres"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "S'asseoir"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Activer/Désactiver les échanges"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "Changer le mode de vision de carte"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "Sélectionner OK"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr "Touches raccourcis"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr "Touche de raccourcis items"
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Raccourci Objet %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr "Touches des fenêtres"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Fenêtre d'Aide"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Fenêtre d'état"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Fenêtre de l'inventaire"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Fenêtre d'équipements."
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Fenêtre de compétences"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Fenêtre de Mini-carte"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Fenêtre de conversation"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Fenêtre de raccourci objet"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Fenêtre de configuration"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Fenêtre d'informations"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "Groupes et Guildes"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Fenêtre de raccourcis d’émoticônes"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "Fenêtre des tenues"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr "Fenêtre du magasin"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr "Fenêtre pour jeter les items"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr "Fenêtre de statistiques"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr "Fenêtre de commandes"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr "Fenêtre du testeur de robot"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "Fenêtre - Qui est en ligne ?"
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "Connaissiez-vous la fenêtre ?"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr "Onglet de dialogue précédent"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr "Onglet de dialogue suivant"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr "Touches d'émoticones"
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Smileys"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Raccourci d'émoticône %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
-msgstr "Touches d'habillages"
+msgstr "Touches des tenues"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "Mettre la tenue"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr "Copier la tenue"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr "Copier l'équipement porté dans les tenues"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr "Touches de la boite de dialogue"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Activer / Désactiver la conversation"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Défiler la conversation (haut)"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Défiler la conversation (bas)"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Onglet de conversation précédent"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Onglet de conversation suivant"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
-msgstr "Fermer la fenêtre de dialogue ouverte"
+msgstr "Fermer l'onglet de dialogue courant"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr "Ligne de conversation précédente"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr "Ligne de conversation suivante"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr "Auto complétion du chat"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr "Désactiver la saisie dans le chat"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
-msgstr "Autre touches"
+msgstr "Autres touches"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ignorer l'entrée 1"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ignorer l'entrée 2"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr "Vers le haut"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr "Vers le bas"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr "Vers la gauche"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr "Vers la droite"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr "Mouvements de fous"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr "Changer le mode de mouvement de fou"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Jeter rapidement N objets depuis l'emplacement 0"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr "Jeter rapidement N objets"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr "Changer de compteur de jet rapide d'objets"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "Soins rapides de la cible ou de soi"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr "Utiliser le sort #itenplz"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "Utiliser l'attaque magique"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr "Changer d'attaque magique"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr "Commutateur d'attaque en PVP"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr "Changer de type de mouvement"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr "Changer de type d'arme d'attaque"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr "Changer de type d'attaque"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr "Changer de type de suivi"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr "Changer de type d'imitation"
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr "Désactiver / Activer les touches de modifications du jeu"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "Son On / Off"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "Activer / Désactiver le mode en absence"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr "Emuler le clic droit à partir du clavier"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr "Changer le mode caméra"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr "Modifier la touche"
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4044,447 +4105,447 @@ msgstr ""
 "Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
 "touches ou attendez vous à un possible comportement étrange du jeu."
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Tu as été tué par %s"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
 msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
-msgstr ""
+msgstr "xp"
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
-msgstr ""
+msgstr "job"
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr "(c) mouvements un peu fous"
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr "(C) mouvements complètements fous"
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
-msgstr "(?) déplacement inconnue"
+msgstr "(?) déplacement inconnu"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
-msgstr "(%d) mouvement de fou numerique %d"
+msgstr "(%d) mouvement de fou numéro %d"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr "(a) mouvements fous personnalisés"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr "(?) mouvements fous"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
-msgstr "(1) Aller à la cible en distante de 1"
+msgstr "(1) Aller à la cible distante de 1"
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
-msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
+msgstr "(2) Aller à la cible jusqu'à 2 de distance"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
-msgstr "(3)  Aller à la cible en distante de 3"
+msgstr "(3)  Aller à la cible distante de 3"
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
-msgstr "(5)  Aller à la cible en distante de 5"
+msgstr "(5)  Aller à la cible distante de 5"
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
-msgstr "(7) Aller à la cible en distante de 7"
+msgstr "(7) Aller à la cible distante de 7"
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
-msgstr "(a) Portée des attaques des Archéens"
+msgstr "(a) Portée de l'attaque des archers"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?) Aller à la cible"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un toutou"
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr "(?) Suivre : mode inconnu"
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) Attaque"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
-msgstr "(s) Attaquer sans protection"
+msgstr "(s) Attaquer sans bouclier"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
-msgstr "(S) Attaquer avec protection"
+msgstr "(S) Attaquer avec bouclier"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?) Ramassage"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) Vue de la carte vide"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) Sorts d'attaque"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr "(a) attaque tous les joueurs"
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
-msgstr ""
+msgstr "(f) attaquer tous, sauf les amis"
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr "(b) attaque les mauvaises relations"
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
-msgstr "(d) Ne pas attaquer les joueurs"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr "(?) attaque en PVP"
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) Absent"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) Absent"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr "Les modificateurs de jeux sont inconnus"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr "Vous voyez  "
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[Manaplus-file]: Le fichier manaplus est un fichier XML (.manaplus)"
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr "utilisé pour définir des paramètres personnalisés"
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr "pour le client manaplus."
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Options :"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : fichier journal à utiliser"
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 "  -L --chat-log-dir   : Dossier a utiliser pour l'enregistrement des "
 "conversatoins"
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Affiche la version"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Montre cette rubrique d'aide"
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Se connecter avec ce mot de passe"
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Se connecter avec ce personnage"
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port de connexion au serveur"
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 "     --update-host : Utilise cette URL pour les fichiers de mises à jour"
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default : Choisir le serveur de personnages et le personnage par "
 "défaut"
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 "  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Répertoire des données du jeu à charger"
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir : Répertoire à utiliser comme répertoire principal"
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Démarrer le jeu en mode sûr"
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Commencer le test des drivers et la configuration "
 "automatique"
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl : Désactive l'OpenGL pour cette session"
 
@@ -4522,7 +4583,7 @@ msgstr "Dextérité :"
 
 #: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
-msgstr "Volonté :"
+msgstr "Chance :"
 
 #: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -4560,7 +4621,7 @@ msgstr "Case incorrecte."
 
 #: src/net/ea/charserverhandler.cpp:167
 msgid "Incorrect race."
-msgstr "Race incorrect."
+msgstr "Race incorrecte."
 
 #: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
@@ -4601,7 +4662,7 @@ msgstr "MVP joueur :"
 
 #: src/net/ea/chathandler.cpp:370
 msgid "All whispers ignored."
-msgstr "Tous les chuchotements sont passés sous silence."
+msgstr "Tous les chuchotements sont ignorés."
 
 #: src/net/ea/chathandler.cpp:374
 msgid "All whispers ignore failed."
@@ -4609,11 +4670,11 @@ msgstr "La mise en silence de tout les chuchotements a échoué"
 
 #: src/net/ea/chathandler.cpp:385
 msgid "All whispers unignored."
-msgstr "Tous les chuchotements ne sont plus sous silence."
+msgstr "Tous les chuchotements ne sont plus ignorés."
 
 #: src/net/ea/chathandler.cpp:389
 msgid "All whispers unignore failed."
-msgstr "La remise en activité de tout les chuchotements a échoué"
+msgstr "La remise en activité de tous les chuchotements a échoué"
 
 #: src/net/ea/gamehandler.cpp:92
 #, c-format
@@ -4716,50 +4777,50 @@ msgstr "%s a quitté votre guilde."
 
 #: src/net/ea/guildhandler.cpp:499
 msgid "You were kicked from guild."
-msgstr "Tu as été viré de la guilde."
+msgstr "Tu as été exclus de la guilde."
 
 #: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr "%s a sorti quelqu'un de votre guilde."
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Invite un joueur à rejoindre votre groupe"
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Affiche / Modifie les préférences d'échange d'objet du groupe"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr "Cette commande vous fait quitter votre groupe actuel."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr "Commande : /item <policy>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 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/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4767,26 +4828,26 @@ msgstr ""
 "<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
 "d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr "Commande : /item"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 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/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr "Commande : /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 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/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -4794,45 +4855,45 @@ 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/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr "Commande : /exp"
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 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/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "Partage d'objet activé."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "Partage d'objet désactivé."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr "Paramètre de partage d'objets inconnu."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "Partage d'expérience autorisé."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "Partage d'expérience non autorisé."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr "Paramètre de partage d'expérience inconnu."
 
@@ -4911,85 +4972,85 @@ msgstr "Ce nom d'utilisateur est déjà utilisé."
 msgid "Username permanently erased."
 msgstr "Le nom de l'utilisateur a été éliminé de façon permanente."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Le groupe n'a pu être créé."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "Création du groupe réussie."
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s a rejoint votre groupe."
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s est déjà membre du groupe."
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s a refusé votre invitation."
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s est maintenant membre de votre groupe."
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s ne peut rejoindre votre groupe. Celui-ci est complet."
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ Erreur inconnue sur l'invitation de %s."
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "Vous avez quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s a quitté le groupe."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Un membre inconnu a essayé de dire : %s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Vous êtes mort."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 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/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Vous n'êtes plus vraiment en vie."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Les mains gelées de la faucheuse viennent réclamer ton âme."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Fin de la partie !"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "Introduire une pièce pour continuer"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4997,7 +5058,7 @@ msgstr ""
 "Non, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,... "
 "il... est parti dans un monde meilleur."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -5005,76 +5066,76 @@ msgstr ""
 "Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
 "gorge a échoué."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 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/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Voulez-vous que vos biens soient identifiés ?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Vaporisé."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Il semble que l'on vous ait rendu votre tête."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr "Vous n'existez plus."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr "Vous avez cessez d'exister."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr "Tu es fini. Tu es parti retrouver ton créateur."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr "Tu es un dur."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr "Privé de toute essence de vie, tu reposes en paix."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 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/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr "Vos processus métaboliques appartiennent au passé maintenant."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr "Tu es en dehors des clous"
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr "Tu viens de toucher le fond."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5082,27 +5143,27 @@ msgstr ""
 "Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint "
 "l'armée de l'ombre."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr "Tu reposes au fond de l'eau."
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "Message"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 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/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Vous portez moins que la moitié de votre poids. Vous pouvez récupérer votre "
@@ -5120,7 +5181,7 @@ msgstr "Vous avez dépensé %s."
 
 #: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
-msgstr "Ne peut pas augmenter la capacité !"
+msgstr "La compétence ne peut pas être augmentée!"
 
 #: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
@@ -5160,11 +5221,11 @@ msgstr "Pas assez de vie !"
 
 #: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
-msgstr "PV insuffisant !"
+msgstr "SP insuffisants !"
 
 #: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
-msgstr "Vous n'avez pas de messages !"
+msgstr "Vous n'avez pas d'aide-mémoire !"
 
 #: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
@@ -5204,7 +5265,7 @@ msgstr "Vous n'avez rien pu voler..."
 
 #: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
-msgstr "Le poison fut sans effet..."
+msgstr "Le poison n'a pas eu d'effet..."
 
 #: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
@@ -5239,9 +5300,7 @@ msgstr "Échange non pris en compte."
 
 #: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
-"Impossible de rajouter un objet. Votre partenaire pour cet échange est "
-"surchargé."
+msgstr "Impossible de rajouter un objet. Votre partenaire est surchargé."
 
 #: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
@@ -5251,7 +5310,7 @@ msgstr ""
 
 #: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
-msgstr "Impossible d'ajouter l'objet. Celui-ci ne peut pas être échangeable."
+msgstr "Impossible d'ajouter l'objet. Celui-ci n'est pas échangeable."
 
 #: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
@@ -5367,7 +5426,7 @@ msgstr "Les caractéristiques du personnage sont trop basses."
 #, c-format
 msgid "At least one stat is out of the permitted range: (%u - %u)."
 msgstr ""
-"Au moins une des caractéristiques est en dehors des limites autorisés : (%u "
+"Au moins une des caractéristiques est en dehors des limites autorisées : (%u "
 "- %u)."
 
 #: src/net/manaserv/charhandler.cpp:178
@@ -5700,24 +5759,24 @@ msgstr "Impossible de connecter au serveur \""
 msgid "Connection to server terminated. "
 msgstr "Connexion au serveur terminée."
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s n'est pas membre de votre groupe !"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr "Affiche '...'"
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr "Fais clignoter le nom"
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr "Bulle flottante '...'"
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr "Bulle flottante"
 
diff --git a/po/he.po b/po/he.po
index d70f59769..5c2f950f8 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,342 +18,364 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "הגדרות"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr "ויד�ו"
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "שגי�ה"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "שגי�ה ביצירת ספריית העדכוני�!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "פקודה ל� מוכרת."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "ל� ניתן לשלוח לחישות ריקות!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
-msgstr ""
-"ל� ניתן ליצור לשונית לחישות עבור הכינוי \"%s\"! הלשונית כבר קיימת �ו שמדובר "
-"בך."
+msgstr "ל� ניתן ליצור לשונית לחישות עבור הכינוי \"%s\"! הלשונית כבר קיימת �ו שמדובר בך."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "מבקש להצטרף לחדר %s."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "ש� חבורה חסר."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "סגירת תיבת הטקסט ה�וטומטית."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "ההודעה סוגרת �ת תיבת הטקסט."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "מקש ה�נטר כעת סוגר �ת תיבת הטקסט."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "ההודעה כעת סוגרת �ת תיבת הטקסט."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "ה�פשרויות עבור /%s הינ� \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "כללי"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "שמירת תמונת־מסך נכשלה"
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "שגי�ת רשת"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "מתעל� מהצעות סחר נכנסות"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "מ�שר הצעות סחר נכנסות"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "שגי�ה בעת טעינת %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -361,23 +384,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "ש�"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "תקוף"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "דבר"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -385,79 +409,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "�פס"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "קנה"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "מחיר: %s / סה\"כ: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "יצי�ה"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "מקסימו�"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "חנות"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "מכר"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "בטל"
 
@@ -493,7 +521,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "שנה סיסמה"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "סיסמה:"
@@ -520,81 +548,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "צור שחקן"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "ש�:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "צור"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "זכר"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "נקבה"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "�נ� חלק %d נקודות"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "יש להכניס לפחות 4 תוי� בש�."
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "נתוני שחקן - �ישור"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "�נ� הסר %d נקודות"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "�שר מחיקת שחקן"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "ה�� �תה בטוח כי ברצונך למחוק �ת השחקן?"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "ניהול משתמש ושחקן"
 
@@ -602,120 +635,122 @@ msgstr "ניהול משתמש ושחקן"
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "בטל רישו�"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "מחק"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "שיחה"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "לוחש �ל %s: %s"
@@ -728,508 +763,553 @@ msgstr "כן"
 msgid "No"
 msgstr "ל�"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "מפה"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "סגור"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "�ישור"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "פורט:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "לבוש"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "הורד"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "עזרה"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
-msgstr "ציוד"
-
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
-msgstr "בשימוש:"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr "ציוד"
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
+msgstr "בשימוש:"
+
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "השתמש"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "פצל"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "משקל:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "�חסן"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "החזר"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "השלך"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "הכל"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "בחר כמות חפצי� לסחור."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "בחר כמות חפצי� להשליך."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "בחר כמות חפצי� ל�חסן."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "בחר כמות חפצי� להחזיר."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "בחר כמות חפצי� לפצל."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "התחברות"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "שרת:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "הרש�"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "ממתין לשרת"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "הב�"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "שלח"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "�ל:"
@@ -1242,345 +1322,382 @@ msgstr "שלח"
 msgid "Failed to send as sender or letter invalid."
 msgstr "נכשלה השליחה מכיוון והשולח �ו המכתב בעלי שגי�ה."
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "סחרר"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "שחקני�"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "החלף שרת"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "החלף שחקן"
 
@@ -1624,200 +1741,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr "פורט:"
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "הוסף"
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
-msgstr "�נ� הכנס ג� �ת כתובת וג� �ת פורט השרת."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "שמע"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "שמע"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "עוצמת SFX"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "עוצמת מוזיקה"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "צבעי�"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "הכנס �ת כל הלחישות ללשוניות"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "כך הצבע נר�ה"
@@ -1865,41 +2021,41 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "�שר"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "�תחל חלונות"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "לחץ על הכפתור בכדי להתחיל בכיול"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "כייל"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "�פשר ג'ויסטיק"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "ג'ויסטיק"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "עצור"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "סובב �ת המקל"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1921,360 +2077,460 @@ msgstr "ברירת מחדל"
 msgid "Key Conflict(s) Detected."
 msgstr "נמצ�ו קונפליקטי מקשי�."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "מפלצות"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "שחקני�"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "שמות גלויי�"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "התנהגות"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "ניטרלי"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "חבר"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "מזלזל"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "מתעל�"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "�פשר מסחר"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "�פשר לחישות"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "כ�שר מתעל�:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "גודל הגופן"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "טען מחדש כדי שהשינוי יחול."
 
@@ -2290,408 +2546,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "לל� טקסט"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "טקסט"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "בועות, לל� שמות"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "בועות ע� שמות"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "כבוי"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "נמוך"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "גבוה"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "בינוני"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "מקסימלי"
-
-#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "מסך מל�"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "סמן-עכבר מות��"
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
-msgstr "�פקטי� חלקיי�"
-
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
-msgstr "הצג התרעת לקיחה"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
-msgstr "בשיחה"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
+msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
-msgstr "ב�ופן חלקי"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
+msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "ויד�ו"
-
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
-msgstr "טקסט מעל הר�ש"
-
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
-msgstr "�טימות Gui"
-
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr "�ופף FX"
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "נדרש �יתחול כדי שהשינויי� יהיו ברי-תוקף."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "�ישור שינויי� עבור OpenGL דורש �יתחול."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
-msgstr "השינויי� יחולו על שינוי המפה."
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "�טימות Gui"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "לל� טקסט"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "טקסט"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "בועות, לל� שמות"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "בועות ע� שמות"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "טקסט מעל הר�ש"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "כבוי"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "נמוך"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "גבוה"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "�ופף FX"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "�פקטי� חלקיי�"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "בינוני"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "מקסימלי"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr "הוסף"
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "בקשה למסחר"
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "כישורי�"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr "למעלה"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "גילדה"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "חבורה"
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "צור גילדה"
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "התקבלה הזמנה לחבורה, �ך הזמנה זהה כבר קיימת."
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s הזמין �ותך לחבורה שלה�."
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s הזמין �ותך להצטרף לחבורת %s."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "�שר �ת הזמנת חבורה"
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2699,502 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "רמה: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "כסף: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "חיי�:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "נסיון:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "קס�:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "עבודה: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "עבודה:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3218,60 +3144,60 @@ msgstr "מוסכ�. ממתין..."
 msgid "Trade: You"
 msgstr "סחור: �תה"
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr "�תה נותן:"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "שנה"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
+msgstr "�ין לך מספיק כסף."
+
+#: src/gui/tradewindow.cpp:454
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "הוספת הפריט נכשלה. ל� ניתן להכניס מעל חפץ �חד לחלון."
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "�ין לך מספיק כסף."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "ש�: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "מעדכן..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "שחק"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  תהליך העדכון ל� ת�."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  מומלץ ביותר שתנסה שוב מ�וחר יותר"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "הסתיי�"
 
@@ -3423,23 +3349,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3504,7 +3430,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "פקודה זו הופכת �ת <nick> למנהל החדר."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "�� <nick> מכיל רווחי� בתוכו, תחו� �ותו במרכ�ות כפולות (\")."
 
@@ -3542,6 +3469,41 @@ msgstr "הודעה גלוב�לית מ�ת %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3671,557 +3633,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "הזז למעלה"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "הזז למטה"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "הזז שמ�לה"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "הזז ימינה"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "כוון ותקוף"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "חייך"
-
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "הפסק לתקוף"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "כוון לדמות"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "כוון לשחקן"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "הר�"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "הסתר חלונות"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "שב"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "תמונת־מסך"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "�פשר/בטל מסחר"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr "בחר �ישור"
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "קיצור־דרך לחפץ %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "חלון עזרה"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "חלון מצב"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "חלון ציוד"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "חלון לבוש"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "חלון כישורי�"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "חלון מיני מפה"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "חלון שיחה"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "חלון קיצור־דרך לחפץ"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "חלון הגדרות"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "חלון ניפוי"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "חלון קיצור־דרך לרגישון"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr "חייך"
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "קיצור־דרך לריגשון %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "סגירת הצ'�ט"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "גלול שיחה למעלה"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "גלול שיחה למטה"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "לשונית השיחה הקודמת"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "לשונית השיחה הב�ה"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "בחר �ישור"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "קלט התעלמות 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "קלט התעלמות 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "�פשרויות:"
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4237,142 +4515,130 @@ msgstr "תודה על הקנייה."
 msgid "Unable to buy."
 msgstr "ל� ניתן לקנות."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "מידע"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4406,418 +4672,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "�תה מת."
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "צר לנו לבשר לכ� כי שחקנכ� נהרג בקרב."
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "�ינך חי כל־כך כרגע."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "קור ידיו של המוות הקודר �וחזי� בנשמתך."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "המשחק נגמר!"
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "ל�, ילדי�. השחקן שלכ� ל� ב�מת מת. הו�... �ה... הלך למקו� טוב יותר."
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "תוכניתך לשבור �ת נשק ה�ויב ב�מצות צוו�רך נכשלה."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "�ני מניח של� הלך לך כל־כך טוב."
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "ה�� ברצונך שי�תרו �ת חלקי גופתך?"
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "ב�ופן מצער, מעול� ל� נמצ� זכר ממך..."
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "הושמדתך."
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "נר�ה כ�ילו ר�שך נמסר �ליך."
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "פישלת שוב, גופתך תיזרק לצינוק ותקבל �חת חדשה."
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4831,160 +5093,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s מעוניין לסחור עימך, ה�� �תה מסכי�?"
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "המסחר בוטל."
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "המסחר הושל�."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "עוצמה"
 
@@ -4993,7 +5255,7 @@ msgstr "עוצמה"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "זריזות"
 
@@ -5002,7 +5264,7 @@ msgstr "זריזות"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "מיומנות"
 
@@ -5011,7 +5273,7 @@ msgstr "מיומנות"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "חיוניות"
 
@@ -5020,7 +5282,7 @@ msgstr "חיוניות"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "תבונה"
 
@@ -5290,41 +5552,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr "עוצמה %+d"
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr "זריזות %+d"
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr "חיוניות %+d"
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr "תבונה %+d"
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr "מיומנות %+d"
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr "מזל %+d"
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5332,129 +5594,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr "נותקת מהשרת!"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "מזל"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s �ינו נמצ� בחבורתך!"
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "לל� ש�"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "התקפה %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "×”×’× ×” %+d"
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "חיי� %+d"
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "חפץ ל� ידוע"
-
-
diff --git a/po/hr.po b/po/hr.po
index 102b0e2fa..96d355c31 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,255 +1,261 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: hr\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"
+"Language: hr\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
 
-#: src/actorspritemanager.cpp:1171
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Slika"
 
-#: src/client.cpp:852
+#: src/client.cpp:990
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:934
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:965
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1098
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1129
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1139
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:1198
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1224
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1225
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1244
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1245
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1265
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1266
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1641
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1702
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Nepoznata naredba."
 
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Ne mogu poslati prazan Å¡apate!"
 
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:349
 #, 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."
+"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/commandhandler.cpp:338
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Zahtjev za pridruživanje kanalu %s."
 
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Ime partije nedostaje."
 
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Poruka zatvara chat."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara chat."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -257,7 +263,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -265,7 +271,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -273,7 +279,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -281,7 +287,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -289,72 +295,72 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Općenito"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Spremanje screenshot-a nije uspjelo!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:572
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Mreža Greška"
 
-#: src/game.cpp:1322
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
 
-#: src/game.cpp:1732
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1733
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Greška prilikom u�itavanja %s"
@@ -383,24 +389,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Ime"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Napad"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Govori"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -408,13 +414,13 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Poništi"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Kupi"
 
@@ -425,67 +431,66 @@ msgid "Price: %s / Total: %s"
 msgstr "Cijena: %s / Ukupno: %s"
 
 #: src/gui/buydialog.cpp:103
-#, fuzzy
 msgid "Amount:"
-msgstr "Korisni�ki ra�un: %s"
+msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:84
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Izlaz"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Trgovina"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Prodaj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
-#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -517,11 +522,11 @@ msgid "The email address entries mismatch."
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Promijeni Lozinku"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Lozinka"
@@ -548,68 +553,73 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "Stvori Lika"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Ime:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Stvori"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Muško"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Žensko"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Molimo, rasporedi %d bodova"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ime mora imati barem 4 znaka."
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Podaci lika su u redu"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Molimo, oduzmi %d bodova"
@@ -626,125 +636,126 @@ msgstr "Da li ste sigurni da želite obrisati ovog lika?"
 msgid "Account and Character Management"
 msgstr "Upravljanje Ra�unom i Likovima"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Odjavi"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Å aptaj prema %s: %s"
@@ -757,16 +768,18 @@ msgstr "Da"
 msgid "No"
 msgstr "Ne"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Karta"
 
@@ -841,121 +854,158 @@ msgstr ""
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvori"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "U redu"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Oprema"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Skini opremu"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Pomoć"
 
 #: src/gui/inventorywindow.cpp:71
-#, fuzzy
 msgid "by name"
-msgstr "Vidljiva imena"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:73
-#, fuzzy
 msgid "by weight"
-msgstr "Težina:"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
@@ -979,31 +1029,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Opremi"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Upotrijebi"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Razdvoji"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
@@ -1012,54 +1062,54 @@ msgid "Weight:"
 msgstr "Težina:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Pohrani"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Preuzmi"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Ispusti"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Sve"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Odaberi koli�inu predmeta za razmjenu."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Odaberi koli�inu predmeta za ispuštanje."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Odaberite koli�inu predmeta za spremanje."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Odaberite iznos predmeta za preuzimanje."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Odaberi koli�inu predmeta za razdvajanje."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
@@ -1072,55 +1122,55 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1128,7 +1178,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1136,29 +1186,29 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
@@ -1166,44 +1216,43 @@ msgstr ""
 msgid "You have left the guild."
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr ""
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr ""
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Korisni�ko ime"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Poslužitelj:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
@@ -1247,31 +1296,27 @@ msgstr ""
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "ÄŒekanje servera"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Slijedeći"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Dostavi"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Za:"
@@ -1284,12 +1329,13 @@ msgstr "Pošalji"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Neuspjelo slanje kao pošiljatelj ili nevažeće pismo."
 
-#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1302,331 +1348,355 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Trgovanje"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "Igra�i"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:538
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
@@ -1670,217 +1740,244 @@ msgstr "Lozinka mora biti kraća od %d znakova."
 msgid "Passwords do not match."
 msgstr "Lozinke se ne podudaraju."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Dodaj"
 
-#: src/gui/serverdialog.cpp:402
-msgid "Please type both the address and the port of a server."
-msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Zvuk"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Zvuk"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Glasnoća zvu�nih efekata"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Glasnoća glazbe"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Boje"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Stavi sve Å¡apate u kartice"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr ""
 
@@ -1931,37 +2028,41 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Primjeni"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Ponovno pokreni prozore"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Pritisnite tipku za po�etak kalibracije"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Kalibriraj"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Omogući igraću palicu"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Igraća palica"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Zaustavi"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Kružite palicom"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1983,168 +2084,168 @@ msgstr "Zadano"
 msgid "Key Conflict(s) Detected."
 msgstr "Otkriven je Konflikt(i) Tipki."
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Čudovišta"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr ""
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #: src/gui/setup_other.cpp:177
@@ -2163,216 +2264,280 @@ msgstr ""
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "Igra�i"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Vidljiva imena"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Odnos"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutralno"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Prijatelj"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Zanemareno"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignorirano"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Dozvoli trgovanje"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Dozvoli Å¡apate"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Kad ignorira:"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Veli�ina fonta"
 
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
 
@@ -2388,184 +2553,193 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Nema teksta"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Tekst"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Mjehurići, bez imena"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Mjehurići s imenima"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "isklju�eno"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "nisko"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "visoko"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "srednje"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Pregled na �itavom ekranu"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Vlastiti kursor"
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
-msgstr "Efekt �estica"
-
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
-msgstr "Prikaži obavijesti o prikupljanju."
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
-msgstr "u chat-u"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
+msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
-msgstr "kao �estica"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
+msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
-msgstr "Tekst iznad glave"
-
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
-msgstr "Prozirnost su�elja"
-
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr "Efekti okruženja"
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
-msgstr "Promjene će stupiti na snagu na promjeni karte."
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Prozirnost su�elja"
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Nema teksta"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Tekst"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Mjehurići, bez imena"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Mjehurići s imenima"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Tekst iznad glave"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "isklju�eno"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "nisko"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "visoko"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Efekti okruženja"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Efekt �estica"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "srednje"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Zahtjev za Trgovanje"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -2583,6 +2757,14 @@ msgstr "Gore"
 msgid "Skill points available: %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2593,6 +2775,11 @@ msgstr ""
 msgid "Skill %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2603,194 +2790,204 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Ceh"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Partija"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Formiraj Ceh"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtjev za partiju, ali ona već postoji."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1604
 #, 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/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1609
 #, 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/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Prihvati Pozivnicu za Partiju"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2798,510 +2995,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:294
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:302
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:306
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:310
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:314
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:318
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:337
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:354
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:358
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:362
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:380
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:384
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:388
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:392
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:396
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:400
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:404
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:408
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:417
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:421
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:425
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:429
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:433
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:437
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:441
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:469
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:473
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:482
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:486
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:490
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:499
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:502
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:513
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:517
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:521
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:537
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Nivo: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Novac: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Zadatak: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Zadatak:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:657
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:691
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:697
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:700
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:719
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:722
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:725
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:739
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:771
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:807
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:824
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:830
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:836
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3343,7 +3169,8 @@ msgid "You don't have enough money."
 msgstr "Nemate dovoljno novca."
 
 #: src/gui/tradewindow.cpp:454
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3351,33 +3178,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Ime: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Ažuriranje"
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Spajanje..."
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Igraj"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces ažuriranja je nepotpun."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Vrlo je preporu�ljivo da"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Dovršeno"
 
@@ -3529,23 +3356,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3610,11 +3437,10 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Ova naredba �ini <nadimak> operatorom kanala."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 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 (\")."
+msgstr "Ako <nick> ima razmake u sebi, zatvoriti ga u dvostrukim navodnicima (\")."
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
@@ -3650,45 +3476,41 @@ msgstr "Javna obavijest od %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3722,7 +3544,8 @@ msgid "Command: /unignore <player>"
 msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -3825,423 +3648,427 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Pomakni Gore"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Pomakni Dolje"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Pomakni Ulijevo"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Pomakni Udesno"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Meta i Napad"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Prekini Napad"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Ciljaj NPC"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Ciljaj Igra�a"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Pokupi"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Skrij Prozore"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Sjedni"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Snimak zaslona"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Omogući/Onemogući Trgovanje"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "Odaberite OK"
 
-#: src/keyboardconfig.cpp:85
-#, fuzzy
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
-msgstr "Pre�ac do Predmeta %d"
+msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Pre�ac do Predmeta %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Prozor za Pomoć"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Prozor Statusa"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Prozor Inventara"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Prozor Opreme"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Prozor Vještine"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Prozor Minikarte"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Chat Prozor"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Prozor za Pre�ice do Predmeta"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Prozor za Postavke"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Debug Prozor"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Prozor Pre�ica za Ispoljavanje emocija"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Smajlić"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Pre�ica za Ispoljavanje emocija %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
-#, fuzzy
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
-msgstr "Chat"
+msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Pomakni Chat Gore"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Pomakni Chat Dolje"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Prethodna Chat Kartica"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Sljedeća Chat Kartica"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4249,40 +4076,41 @@ msgid ""
 msgstr ""
 
 #: src/localplayer.cpp:381
-msgid "You were killed by "
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4290,119 +4118,396 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Opcije:"
 
-#: src/main.cpp:54
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4418,71 +4523,75 @@ msgstr "Hvala za kupnju."
 msgid "Unable to buy."
 msgstr "Ne može se kupiti"
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
@@ -4512,35 +4621,31 @@ msgid "MVP player: "
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:370
-#, fuzzy
 msgid "All whispers ignored."
-msgstr "Dozvoli Å¡apate"
+msgstr ""
 
 #: src/net/ea/chathandler.cpp:374
-#, fuzzy
 msgid "All whispers ignore failed."
-msgstr "Stavi sve Å¡apate u kartice"
+msgstr ""
 
 #: src/net/ea/chathandler.cpp:385
-#, fuzzy
 msgid "All whispers unignored."
-msgstr "Dozvoli Å¡apate"
+msgstr ""
 
 #: src/net/ea/chathandler.cpp:389
-#, fuzzy
 msgid "All whispers unignore failed."
-msgstr "Stavi sve Å¡apate u kartice"
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -4630,116 +4735,116 @@ msgstr ""
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -4751,249 +4856,248 @@ msgstr ""
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Vi ste mrtvi."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 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/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Niste više tako živi."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Kraj Igre!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 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."
+msgstr "Ne, djeco. Vaš lik zapravo nije umro. On... err... je otišao na bolje mjesto."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Predpostavljam da ovo nije išlo previše dobro."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Želite li svoju imovinu identificirati?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Nažalost, ni traga od vas nije nikada pronađeno ..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Uništen."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Izgleda da su vam predali vašu glavu."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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."
+msgstr "Uprskali ste opet, odbacite svoje tijelo u kanalizaciju i nabavite novo."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -5100,57 +5204,57 @@ msgstr ""
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s želi trgovati s vama, prihvaćate li?"
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "Otkazano trgovanje."
 
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "Trgovanje je završeno."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Snaga"
 
@@ -5159,7 +5263,7 @@ msgstr "Snaga"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Okretnost"
 
@@ -5168,7 +5272,7 @@ msgstr "Okretnost"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Spretnost"
 
@@ -5177,7 +5281,7 @@ msgstr "Spretnost"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Vitalnost"
 
@@ -5186,7 +5290,7 @@ msgstr "Vitalnost"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Inteligencija"
 
@@ -5518,111 +5622,111 @@ msgstr ""
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Sreća"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s nije u vašoj partiji!"
 
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "neimenovano"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Napad %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Obrana %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "Zdravlje %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "Mana %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Nepoznati predmet"
diff --git a/po/hu.po b/po/hu.po
index 77bf63a7a..a090302c4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,355 +1,361 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-10-28 03:52+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1171
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:548
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1527
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1532
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:835 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:842 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:847 src/gui/setup_video.cpp:315
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Videó"
 
-#: src/client.cpp:852
+#: src/client.cpp:990
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:934
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:965
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:998
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1098
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1129
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1139
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1182 src/client.cpp:1189 src/client.cpp:1323
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:1198
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1224
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1225
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1244
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1245
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1265
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1266
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1465 src/client.cpp:1495 src/client.cpp:1510
-#: src/client.cpp:1935 src/client.cpp:1942
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1641
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1675 src/client.cpp:1681
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1702
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:205
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Ismeretlen parancs."
 
-#: src/commandhandler.cpp:304
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Nem küldhetsz üres üzenetet!"
 
-#: src/commandhandler.cpp:318
+#: src/commandhandler.cpp:349
 #, 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."
+"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/commandhandler.cpp:338
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/commandhandler.cpp:354 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "A csapatnév hiányzik."
 
-#: src/commandhandler.cpp:365
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:378 src/commandhandler.cpp:496
-#: src/commandhandler.cpp:537 src/commandhandler.cpp:572
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Az enter megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:430
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Az üzenet bezárja a bevitelt."
 
-#: src/commandhandler.cpp:441
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Az enter mostantól megnyitja a bevitelt."
 
-#: src/commandhandler.cpp:447
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Az üzenet mostantól bezárja a bevitelt."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:480
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:485
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:504
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:518
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:526
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:549
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:556
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:558
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:564
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:579
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:892 src/commandhandler.cpp:938
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:902
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:911
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:919
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:927
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:935
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1014
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1026
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1030
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1032
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1133 src/commandhandler.cpp:1140
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1135 src/commandhandler.cpp:1142
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", "
-"\"0\"."
+msgstr "Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:252 src/gui/widgets/chattab.cpp:403
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "�ltalános"
 
-#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:405
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:513
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:521
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Hiba a képernyő mentése során!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:572
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Hálózati hiba"
 
-#: src/game.cpp:1322
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Kereskedési kérelmek elutasítása"
 
-#: src/game.cpp:1332
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Kereskedési kérelmek elfogadása"
 
-#: src/game.cpp:1732
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1733
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Hiba %s betöltése közben"
@@ -378,24 +384,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Név"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:614
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:269
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Támadás"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:281
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Csevegés"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:253
-#: src/gui/popupmenu.cpp:285 src/gui/popupmenu.cpp:437
-#: src/gui/popupmenu.cpp:669 src/gui/popupmenu.cpp:756
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -403,13 +409,13 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Alaphelyzet"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:265
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:681
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Vétel"
 
@@ -420,67 +426,66 @@ msgid "Price: %s / Total: %s"
 msgstr "�r: %s / Teljes: %s"
 
 #: src/gui/buydialog.cpp:103
-#, fuzzy
 msgid "Amount:"
-msgstr "Fiók: %s"
+msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:977
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:989
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
-#: src/keyboardconfig.cpp:84
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Kilépés"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:554
-#: src/gui/statuswindow.cpp:976 src/gui/statuswindow.cpp:1007
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Max."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Ãœzlet"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:266
-#: src/gui/popupmenu.cpp:283 src/gui/popupmenu.cpp:682
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Eladás"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:333
-#: src/gui/popupmenu.cpp:354 src/gui/popupmenu.cpp:478
-#: src/gui/popupmenu.cpp:504 src/gui/popupmenu.cpp:528
-#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:559
-#: src/gui/popupmenu.cpp:772 src/gui/popupmenu.cpp:796
-#: src/gui/popupmenu.cpp:1732 src/gui/popupmenu.cpp:1760
-#: src/gui/popupmenu.cpp:1816 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1935
-#: src/gui/popupmenu.cpp:1987 src/gui/popupmenu.cpp:2007
-#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
-#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:161
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -512,11 +517,11 @@ msgid "The email address entries mismatch."
 msgstr ""
 
 #: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
 msgstr "Jelszó módosítása"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Jelszó:"
@@ -543,68 +548,73 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "Karakter létrehozása"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Név:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
-#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
-#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:86
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
-#: src/gui/socialwindow.cpp:1139
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Létrehozás"
 
-#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Férfi"
 
-#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "NÅ‘"
 
-#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Kérlek oszd el a pontjaidat (%d van még)"
 
-#: src/gui/charcreatedialog.cpp:222
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "A nevednek minimum 4 karakternek kell lennie."
 
-#: src/gui/charcreatedialog.cpp:294
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Karakter statok rendben"
 
-#: src/gui/charcreatedialog.cpp:308
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Kérlek távolíts el %d pontot"
@@ -621,125 +631,126 @@ msgstr "Biztos hogy ki akarod törölni ezt a karaktert?"
 msgid "Account and Character Management"
 msgstr "Fiók és Karakter Menedzsment"
 
-#: src/gui/charselectdialog.cpp:138
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Regisztráció megszüntetése"
 
-#: src/gui/charselectdialog.cpp:161
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:253
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:286
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:244
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/gui/charselectdialog.cpp:468
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:471
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_relations.cpp:221 src/gui/setup_theme.cpp:73
-#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:613
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1000
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Üzenet %s számára: %s"
@@ -752,16 +763,18 @@ msgstr "Igen"
 msgid "No"
 msgstr "Nem"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:387
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:626
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Térkép"
 
@@ -836,121 +849,158 @@ msgstr ""
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:574 src/gui/shopwindow.cpp:113
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Bezár"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
-#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Felszerelés"
 
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1694 src/gui/popupmenu.cpp:1786
-#: src/gui/popupmenu.cpp:1831
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Nem használ"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Súgó"
 
 #: src/gui/inventorywindow.cpp:71
-#, fuzzy
 msgid "by name"
-msgstr "Látható nevek"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:72
 msgid "by id"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:73
-#, fuzzy
 msgid "by weight"
-msgstr "Súly:"
+msgstr ""
 
 #: src/gui/inventorywindow.cpp:74
 msgid "by amount"
@@ -974,31 +1024,31 @@ msgid "Filter:"
 msgstr ""
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1696
-#: src/gui/popupmenu.cpp:1788 src/gui/popupmenu.cpp:1833
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Használ"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1700
-#: src/gui/popupmenu.cpp:1755 src/gui/popupmenu.cpp:1792
-#: src/gui/popupmenu.cpp:1837
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Bevet"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1797
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
-#: src/gui/popupmenu.cpp:1806 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Felosztás"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:537
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
@@ -1007,54 +1057,54 @@ msgid "Weight:"
 msgstr "Súly:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1680 src/gui/popupmenu.cpp:1809
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Raktároz"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1721
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Magához vesz"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1710
-#: src/gui/popupmenu.cpp:1802 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Eldob"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Mind"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Válaszd ki mennyi tárggyal akarsz üzletelni."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Válaszd ki mennyit akarsz eldobni."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Válaszd ki a raktározandó mennyiséget."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Válaszd ki mennyit veszel magadhoz."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Válaszd ki az elosztandó mennyiséget."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
@@ -1067,91 +1117,91 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
@@ -1159,44 +1209,43 @@ msgstr ""
 msgid "You have left the guild."
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr ""
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr ""
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Belépés"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Szerver:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Regisztráció"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
@@ -1240,31 +1289,27 @@ msgstr ""
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Várakozás a szerverre"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Következő"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Küldés"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "Gépjátékos"
 
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:576
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Cél:"
@@ -1277,12 +1322,13 @@ msgstr "Küldés"
 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/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
@@ -1295,331 +1341,355 @@ msgstr ""
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Ãœzlet"
 
-#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:372
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:618
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:378
-#: src/gui/popupmenu.cpp:624
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:152
-#: src/gui/popupmenu.cpp:160 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:379 src/gui/popupmenu.cpp:386
-#: src/gui/popupmenu.cpp:394 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:625 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640 src/gui/popupmenu.cpp:658
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:154
-#: src/gui/popupmenu.cpp:381 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:627 src/gui/popupmenu.cpp:634
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
 msgid "Black list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:155
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:168
-#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:382
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:628 src/gui/popupmenu.cpp:635
-#: src/gui/popupmenu.cpp:642 src/gui/popupmenu.cpp:648
-#: src/gui/popupmenu.cpp:653
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:166
-#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:393 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:406 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:639 src/gui/popupmenu.cpp:646
-#: src/gui/popupmenu.cpp:652 src/gui/popupmenu.cpp:657
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:179
-#: src/gui/popupmenu.cpp:401 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:647 src/gui/popupmenu.cpp:659
-#: src/playerrelations.cpp:421
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:187 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:667 src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:422
-#: src/gui/popupmenu.cpp:668 src/gui/popupmenu.cpp:747
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:700
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:433
-#: src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:229
-#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:234
-#: src/gui/popupmenu.cpp:455 src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:242 src/gui/popupmenu.cpp:463
-#: src/gui/popupmenu.cpp:736
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:254 src/gui/popupmenu.cpp:670
-#: src/gui/popupmenu.cpp:759
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:255 src/gui/popupmenu.cpp:671
-#: src/gui/popupmenu.cpp:760 src/gui/popupmenu.cpp:2004
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:256 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:672
-#: src/gui/popupmenu.cpp:761
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:471
-#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:766
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:472
-#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:767
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:297
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:313
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330 src/gui/popupmenu.cpp:475
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:500
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "Játékosok"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:501 src/gui/popupmenu.cpp:1730
-#: src/gui/popupmenu.cpp:1810 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:518
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:520 src/gui/popupmenu.cpp:1965
-#: src/gui/popupmenu.cpp:1976 src/gui/popupmenu.cpp:1980
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:525
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:538
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:554 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:556
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:584
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:590
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:595 src/gui/socialwindow.cpp:1141
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:780
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1245
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1295
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1297
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1686
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1798
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1725
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1726
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1934 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1952 src/gui/socialwindow.cpp:958
-#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1962 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1964 src/gui/popupmenu.cpp:1975
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
@@ -1663,217 +1733,244 @@ msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
 msgid "Passwords do not match."
 msgstr "A jelszavak nem egyeznek."
 
-#: src/gui/serverdialog.cpp:237
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:239
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:253
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:257
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:271
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:295
+#: src/gui/serverdialog.cpp:262
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:296
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:297
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Hozzáad"
 
-#: src/gui/serverdialog.cpp:402
-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:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:565
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:569
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:573
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Audió"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Audió"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Effektek hangereje"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Zene hangereje"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Színek"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Privátok fülekbe tétele"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr ""
 
@@ -1924,37 +2021,41 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Alkalmaz"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Ablakok alaphelyzetbe"
 
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Nyomd meg a gombot a kalibrálás megkezdéséhez"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Kalibrálás"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Joystick engedélyezése"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Leállít"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Mozgasd körbe"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1976,168 +2077,168 @@ msgstr "Alapértelmezett"
 msgid "Key Conflict(s) Detected."
 msgstr "Billentyű ütközés van."
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Szörny neve"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr ""
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #: src/gui/setup_other.cpp:177
@@ -2156,216 +2257,280 @@ msgstr ""
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "Játékosok"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Látható nevek"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Kapcsolat"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Semleges"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Barát"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Semmibevett"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Tiltott"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Üzletelés engedélyezése"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Privát engedélyezése"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Ha ignorolva van:"
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:183
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Betűméret"
 
-#: src/gui/setup_theme.cpp:299
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 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."
 
@@ -2381,184 +2546,193 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Nincs szöveg"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Szöveg"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Buborékok, nincs név."
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Buborékok nevekkel"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "ki"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "alacsony"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "magas"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "közepes"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "max."
-
-#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Teljes képernyő"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Egyéni kurzor"
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
-msgstr "Játékbéli effektek"
-
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
-msgstr "Értesítés tárgy felvételkor"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
-msgstr "Chat-en belül"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
+msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
-msgstr "Karakter felett"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
+msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
-msgstr "Fej feletti szöveg"
-
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
-msgstr "Menük áttetszősége"
-
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr "Környezeti effektek"
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:708
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:396
 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/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:409
 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/setup_video.cpp:602
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Menük áttetszősége"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Nincs szöveg"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Szöveg"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Buborékok, nincs név."
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Buborékok nevekkel"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Fej feletti szöveg"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "ki"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "alacsony"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "magas"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Környezeti effektek"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Játékbéli effektek"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "közepes"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "max."
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-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/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
-#: src/gui/shopwindow.cpp:75
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
-#: src/gui/tradewindow.cpp:89
-msgid "Add"
-msgstr "Hozzáad"
-
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
 msgid "Auction"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Üzleti ajánlat"
 
-#: src/gui/shopwindow.cpp:749
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
@@ -2576,6 +2750,14 @@ msgstr "Fejleszt"
 msgid "Skill points available: %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2586,6 +2768,11 @@ msgstr ""
 msgid "Skill %d"
 msgstr ""
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2596,194 +2783,204 @@ msgstr ""
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Klán"
 
-#: src/gui/socialwindow.cpp:147
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:161
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Csapat"
 
-#: src/gui/socialwindow.cpp:347
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:361
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:388
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:389
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:398
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:399
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:625
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:903
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:944
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:976
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1011
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1074
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Klán létrehozása"
 
-#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1140
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1286
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1296
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1313
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1326
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1396
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1410
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1411
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1425
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1431
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1437
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Csapatba hívtak, de neked van csapatod."
 
-#: src/gui/socialwindow.cpp:1463
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1467
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1475
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s a csapatába hívott."
 
-#: src/gui/socialwindow.cpp:1480
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s behívott %s csapatába."
 
-#: src/gui/socialwindow.cpp:1489
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Ajánlat elfogadása"
 
-#: src/gui/socialwindow.cpp:1504
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1509
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1510
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2791,510 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(a) archer attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:294
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:302
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:306
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:310
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:314
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:318
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327 src/gui/statuspopup.cpp:350
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:337
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:341 src/gui/statuspopup.cpp:366
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:354
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:358
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:362
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:380
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:384
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:388
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:392
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:396
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:400
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:404
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:408
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:417
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:421
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:425
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:429
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:433
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:437
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:441
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:469
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:473
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:482
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:486
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:490
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:499
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:502
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:505 src/gui/statuspopup.cpp:525
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:513
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:517
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:521
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:537
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
-#: src/gui/statuswindow.cpp:336
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Szint: %d"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:303
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Pénz: %s"
 
-#: src/gui/statuswindow.cpp:150
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "Élet:"
 
-#: src/gui/statuswindow.cpp:157
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "TP:"
 
-#: src/gui/statuswindow.cpp:171
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "Varázserő:"
 
-#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Munka: %d"
 
-#: src/gui/statuswindow.cpp:204
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Munka:"
 
-#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:268
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:324
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:716
-#: src/gui/statuswindow.cpp:736 src/gui/statuswindow.cpp:752
-#: src/gui/statuswindow.cpp:798 src/gui/statuswindow.cpp:827
-#: src/gui/statuswindow.cpp:850 src/gui/statuswindow.cpp:869
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:651 src/gui/statuswindow.cpp:777
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:654 src/gui/statuswindow.cpp:774
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:657
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:660 src/gui/statuswindow.cpp:761
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:663 src/gui/statuswindow.cpp:677
-#: src/gui/statuswindow.cpp:709 src/gui/statuswindow.cpp:728
-#: src/gui/statuswindow.cpp:745 src/gui/statuswindow.cpp:764
-#: src/gui/statuswindow.cpp:786 src/gui/statuswindow.cpp:816
-#: src/gui/statuswindow.cpp:842 src/gui/statuswindow.cpp:856
-#: src/gui/statuswindow.cpp:872 src/gui/statuswindow.cpp:885
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:674 src/gui/statuswindow.cpp:706
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:691
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:694 src/gui/statuswindow.cpp:804
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:697
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:700
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:703 src/gui/statuswindow.cpp:758
-#: src/gui/statuswindow.cpp:813 src/gui/statuswindow.cpp:882
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:719
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:722
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:725
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:739
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:742 src/gui/statuswindow.cpp:795
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:755 src/gui/statuswindow.cpp:810
-#: src/gui/statuswindow.cpp:863
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:771
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:801
-#: src/gui/statuswindow.cpp:866
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:783 src/gui/statuswindow.cpp:833
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:807
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:824
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:830
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:836
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:839
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:853 src/gui/statuswindow.cpp:879
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3336,42 +3162,42 @@ msgid "You don't have enough money."
 msgstr "Nincs elég pénzed."
 
 #: src/gui/tradewindow.cpp:454
-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."
+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/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Név: %s"
 
-#: src/gui/updaterwindow.cpp:138
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Frissítés…"
 
-#: src/gui/updaterwindow.cpp:159
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Csatlakozás…"
 
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Játék"
 
-#: src/gui/updaterwindow.cpp:564
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1 A frissítési folyamat befejezetlen"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Erősen ajánljuk, hogy"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updaterwindow.cpp:744
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Kész"
 
@@ -3523,23 +3349,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:85 src/gui/whoisonline.cpp:479
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:108
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:302
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:493
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:525
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3601,15 +3427,13 @@ msgstr "Parancs: /op <név>"
 
 #: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
-msgstr ""
-"Ez a parancs a <név> alatt megadott személyt csatorna operátorrá teszi."
+msgstr "Ez a parancs a <név> alatt megadott személyt csatorna operátorrá teszi."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Ha a <név> alatt megadott név szóközt tartalmaz idézőjelbe kell tenni. (\")."
+msgstr "Ha a <név> alatt megadott név szóközt tartalmaz idézőjelbe kell tenni. (\")."
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
@@ -3645,45 +3469,41 @@ msgstr "Globális bejelentés (%s) :"
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3717,7 +3537,8 @@ msgid "Command: /unignore <player>"
 msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:131
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
 #: src/gui/windowmenu.cpp:65
@@ -3820,423 +3641,427 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Mozgás felfelé"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Mozgás lefelé"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Mozgás balra"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Mozgás jobbra"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Kijelöl és Támad"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Támadás Megszüntetése"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Gépjátékost Kijelöl"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Játékost Kijelöl"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Felvesz"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Ablakok Elrejtése"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Ülés"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Képernyőkép"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Üzletelés Engedélyezése/Tiltása"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "Ok Kiválasztása"
 
-#: src/keyboardconfig.cpp:85
-#, fuzzy
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
-msgstr "Gyorsmenü %d"
+msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:369
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Gyorsmenü %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Súgó Ablak"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Sztátusz Ablak"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Táska Ablak"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Felszerelés Ablak"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Képességek Ablak"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Minitérkép Ablak"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Chat Ablak"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Gyorsmenü Ablak"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Beállítások Ablak"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Hibakereső Ablak"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Hangulatjel Gyorsmenü Ablak"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Hangulatjel"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:364
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Hangulatjel Gyorsmenü %d"
 
-#: src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:277
-#, fuzzy
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
-msgstr "Chat"
+msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Chat Ki/Be Kapcsolása"
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Csevej Felfele Görgetése"
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Csevej Lefele Görgetése"
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Előző Chat Fül"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Következő Chat Fül"
 
-#: src/keyboardconfig.cpp:289
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:300
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ignore input 1"
 
-#: src/keyboardconfig.cpp:302
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ignore input 2"
 
-#: src/keyboardconfig.cpp:304
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:314
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:336
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:348
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:427
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4244,159 +4069,437 @@ msgid ""
 msgstr ""
 
 #: src/localplayer.cpp:381
-msgid "You were killed by "
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1428
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1430
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1432
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1434
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1466
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3181
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3509
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3511 src/localplayer.cpp:3526
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3518
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3520 src/localplayer.cpp:3528
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3876
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Opciók:"
 
-#: src/main.cpp:54
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4412,71 +4515,75 @@ msgstr "Öröm volt veled üzletet kötni!"
 msgid "Unable to buy."
 msgstr "Nem tudod megvenni."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:235
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Infó"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
@@ -4506,35 +4613,31 @@ msgid "MVP player: "
 msgstr ""
 
 #: src/net/ea/chathandler.cpp:370
-#, fuzzy
 msgid "All whispers ignored."
-msgstr "Privát engedélyezése"
+msgstr ""
 
 #: src/net/ea/chathandler.cpp:374
-#, fuzzy
 msgid "All whispers ignore failed."
-msgstr "Privátok fülekbe tétele"
+msgstr ""
 
 #: src/net/ea/chathandler.cpp:385
-#, fuzzy
 msgid "All whispers unignored."
-msgstr "Privát engedélyezése"
+msgstr ""
 
 #: src/net/ea/chathandler.cpp:389
-#, fuzzy
 msgid "All whispers unignore failed."
-msgstr "Privátok fülekbe tétele"
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Game"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
 msgid "Request to quit denied!"
 msgstr ""
 
@@ -4624,116 +4727,116 @@ msgstr ""
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:498
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:511
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:284
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:294
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:304
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:246
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:256
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:266
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -4745,251 +4848,248 @@ msgstr ""
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:241
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:203
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:206
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:209
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:212
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:215
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:238
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:357
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:370
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:447
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Meghaltál."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "A karaktered elvérzett a csatában."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Nem vagy már az élők sorában."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 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/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Vége a játéknak!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 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."
+msgstr "Nem, gyerekek. A karakter nem meghalt, ..ööö... hanem egy szebb világba került."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 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."
+msgstr "A tervet, amiben a torkoddal támadsz az ellenség kardjába sikertelennek bizonyult."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Úgy látszik nem futottál túl gyorsan."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Meg akarod bánni a bűneid?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Kövesd a fényt az alagút végén."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Megöltek."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Kezedbe adták a fejed."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -5096,57 +5196,57 @@ msgstr ""
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s üzletelni akar veled. Te akarsz vele?"
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:142
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:158
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:171
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:246
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:250
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:269 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "Az üzlet megszakadt."
 
-#: src/net/ea/tradehandler.cpp:280 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "Sikeres üzlet."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Erő"
 
@@ -5155,7 +5255,7 @@ msgstr "Erő"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Mozgékonyság"
 
@@ -5164,7 +5264,7 @@ msgstr "Mozgékonyság"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:266
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Ügyesség"
 
@@ -5173,7 +5273,7 @@ msgstr "Ügyesség"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:264
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Egészség"
 
@@ -5182,7 +5282,7 @@ msgstr "Egészség"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:265
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Intelligencia"
 
@@ -5514,111 +5614,111 @@ msgstr ""
 msgid "Got disconnected from server!"
 msgstr "Lekapcsolódtál a szerverről!"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Szerencse"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:272
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:274
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:279
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:281
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:283
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:285
+#: src/net/tmwa/generalhandler.cpp:288
 msgid "Damage per sec."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s nincs a csapatodban!"
 
-#: src/playerrelations.cpp:435
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:455
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:502
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "Névtelen"
 
-#: src/resources/itemdb.cpp:63
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Támadás %+d"
 
-#: src/resources/itemdb.cpp:64
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Védelem %+d"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "Élet: %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "Varázserő %+d"
 
-#: src/resources/itemdb.cpp:169
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Ismeretlen tárgy"
diff --git a/po/id.po b/po/id.po
index 87b86049f..cf2a3d91f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,80 +10,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-02 16:45+0000\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
-"id/)\n"
+"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/"
+"language/id/)\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "Menghindar"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "Luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Pengaturan"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Terhubung dengan server"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Masuk"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Pemilihan karakter"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "terhubung dengan server"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Pergantian server"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -93,63 +97,63 @@ msgstr "Pergantian server"
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Ubah sandi"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "Perubahan email"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Gagal membuat direktori update!"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Perintah tidak dikenal."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Tidak dapat mengirimkan pesan tanpa nama"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,155 +162,155 @@ msgstr ""
 "Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
 "atau nama anda sendiri"
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Meminta untuk masuk ke channel %s."
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Nama kelompok tidak dapat di temukan"
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "Nama organisasi tidak ditemukan."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama"
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Kembalikan pengalihan obrolan"
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Tutup pesan obrolan"
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Kembalikan sekarang pengalihan obrolan"
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Pesan menutup obrolan"
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "Teman"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "Diabaikan"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "netral"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "Pemain telah %s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pemain telah berhasil %s!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Pemain tidak bisa %s!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "Pemain tidak diabaikan!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "Pemain tidak lagi diabaikan!"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "Pemain tidak dapat diabaikan"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "Pemain telah terhapus"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "Pemain telah berhasil dihapus"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "Pemain tidak dapat dihapus"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "Ukuran jenis huruf cache"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr "Ukuran Cache:"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "Buat"
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "Hapus"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr "Sumber gambar"
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -316,11 +320,11 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Umum"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "Debug"
 
@@ -381,18 +385,18 @@ msgstr "Komentar: %s"
 msgid "Bot Checker"
 msgstr "Pengecek Bot"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Nama"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Pukul"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Berbicara"
 
@@ -430,7 +434,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -438,25 +442,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Keluar"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Toko"
 
@@ -480,8 +484,8 @@ msgstr "Jual"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Batal"
@@ -654,8 +658,8 @@ msgid "Enter password:"
 msgstr "Masukkan sandi"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Hapus"
 
@@ -673,6 +677,7 @@ msgid "(empty)"
 msgstr "(kosong)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "kembalikan ke semula"
 
@@ -730,24 +735,23 @@ msgstr "pelangi 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Obrolan"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
@@ -771,7 +775,7 @@ msgid "Ignore"
 msgstr "Abaikan"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Peta"
 
@@ -846,62 +850,76 @@ msgstr "Penghitungan tekstur:"
 msgid "Particle count: %d"
 msgstr "Hitung partikel: %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Target"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "Id target:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
-msgstr "Target Level"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
-msgstr "Target Kelompok:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
-msgstr "Target Organisasi:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "Kecepatan menyerang:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr "Pukulan minimal:"
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr "Pukulan maksimal:"
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr "Pukulan kritis:"
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Target Level"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Target Kelompok:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Target Organisasi:"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Masuk: %d bytes/det"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Keluar: %d bytes/det"
@@ -928,8 +946,8 @@ msgstr "Selanjutnya"
 msgid "Auto open this window"
 msgstr "Buka jendela otomatis"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -1041,7 +1059,7 @@ msgstr "Berat"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Simpan"
 
@@ -1100,89 +1118,89 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Berat: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Stat membunuh"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "Atur ulang stats"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "Atur ulang penghitung waktu"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Level: %d pada %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d Tersisa:%d"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "%%= %d exp, rata-rata mob untuk 1%%: %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Membunuh: %s, exp total: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Rata-rata: %s, No. dari rata-rata mob ke level selanjutnya: %s"
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Membunuh/menit: %s, Exp/menit: %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Kecepatan Exp per %d menit: %s"
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Waktu sebelum naik ke level selanjutnya %d menit: %s"
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "Exp terakhir"
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr "waktu sebelum Jacko kembali"
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "waktu untuk ke level selanjutnya: %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr "Jacko bertelur"
 
@@ -1283,7 +1301,7 @@ msgid "Submit"
 msgstr "Masukan"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
@@ -1393,7 +1411,7 @@ msgstr "Batalkan pengabaian"
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
@@ -1489,7 +1507,7 @@ msgstr "Tambahkan ke daftar Abaikan"
 msgid "Add name to chat"
 msgstr "Tambahkan nama ke Obrolan"
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Pemain"
 
@@ -1656,12 +1674,12 @@ msgstr "Tampilkan"
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Pindahkan ke chat"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(kembalikan)"
@@ -1739,25 +1757,25 @@ msgstr "Menyambung"
 msgid "Add"
 msgstr "Tambah"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Ganti"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Mengunduh daftar server... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "Menyambung ke server..."
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Menyiapkan pengunduhan"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "Gagal mengunduh data server!"
 
@@ -1770,155 +1788,188 @@ msgstr "Membutuhkan versi terbaru"
 msgid "requires v%s"
 msgstr "Membutuhkan v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Suara"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Perbolehkan Audio"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "Perbolehkan musik"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "Perbolehkan game sfx"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "Perbolehkan gui sfx"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "Perbolehkan musik"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "Perbolehkan gumaman obrolan suara"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "Unduh musik"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Suara"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Volume sfx"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Volume Musik"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Peringatan"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
-msgstr "Anda harus merestart klien anda untuk mengunduh musik baru."
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Pengaturan suara"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "Lainnya"
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "Perbolehkan gumaman obrolan suara"
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "Unduh musik"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Warna"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Hapus warna dari pesan obrolan yang masuk"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Tunjukkan daftar warna obrolan"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "Perintah"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Perbolehkan sihir dan Perintah GM di semua jendela obrolan"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "Batas"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Batas maksimal karakter di garis obrolan"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Batas maksimal baris di obrolan"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "Daftar"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "Perbolehkan riwayat obrolan"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Tunjukkan riwayat obrolan"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "Pesan"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Sembunyikan pesan Jual"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "Tab"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Masukkan semua bisikan kedalam tab"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "Riwayat pesan sihir di jendela debug"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Tujukkan pesan server di jendela debug"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "Perbolehkan jendela transkaksi/trade"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "Perbolehkan jendela pertarungan"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "Tunjukkan event pertarungan"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr "Atur besar jendela obrolan apabila dibutuhkan"
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "Waktu"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "Pengunaan waktu lokal"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "Lainnya"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr ""
 
@@ -1969,40 +2020,40 @@ msgstr "Biru:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Terapkan"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Kalibrasi"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Membolehkan joistik"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Berhenti"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -2025,456 +2076,460 @@ msgstr "Kembalikan"
 msgid "Key Conflict(s) Detected."
 msgstr "Pertentangan kunci(kunci) terdeteksi."
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "macam-macam"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Tampilkan damage yang ditimbulkan monster"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "Jadikan monster yang terjangkau sebagai target otomatis"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Sorot Jangkauan menyerang monster"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "Tampilkan hp bar monster"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "Siklus target monster"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "Sorot portal peta"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Sorot item yang jatuh"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Sorot Jangkauan menyerang pemain"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr ""
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "Bergerak"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "Perbaiki posisi otomatis"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "Menyerang ketika berjalan"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "Program Crazy move A"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "Pemain"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Tampilkan hp bar sendiri"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "Siklus target pemain"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "Tampilkan pesan exp job"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "Tampilkan popup pemain"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr "Pesan saat meninggalkan keyboard"
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "Perlihatkan Job"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr "Perbolehkan Penyaring Serangan"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Terima permintaan jual/beli"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "Perbolehkan mode Jual"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "Riwayat dialog NPC"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Perbolehkan pengecekan bot"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Perlihatkan latar belakang"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "Akselerasi perangkat keras"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Perlihatkan jenis kelamin"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Perlihatkan Level"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Perlihatkan nama sendiri"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "Target pemain yang mati"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Nama yang tampak"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr "Pertukaran yang aman"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr "Penggunaan karakter yang tidak diperbolehkan pada nama"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr "Perlihatkan status"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Hubungan"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Netral"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Teman"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Diabaikan"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ditolak"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Dihapus"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Perbolehkan penukaran"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Perbolehkan berbisik"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Lama"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Ketika menolak:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Sangat kecil (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Kecil (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Sedang (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Besar (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Sangat besar (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Sangat besar sekali (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "Tema Gui"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "Jenis huruf utama"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Jenis huruf tebal"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr "Jenis huruf/Karakter yang diperbolehkan"
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Ukuran huruf"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Tema diganti"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
 
@@ -2490,156 +2545,162 @@ msgstr "OpenGL cepat"
 msgid "Safe OpenGL"
 msgstr "OpenGL aman"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "tidak ada teks"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Teks"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "mati"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "rendah"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "tinggi"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "sedang"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "maksimal"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Modifikasi kursor"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Efek partikel"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Perlihatkan notifikasi pengambilan item"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "dalam obrolan"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "sebagai partikel"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "Batas FPS:"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "batas Alt FPS:"
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr ""
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr ""
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "Detil partikel"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "Tidak ada"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Mengubah ke mode Layar penuh"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Mengubah ke OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Modifikasi resolusi (contoh: 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "Masukkan resolusi baru:"
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "Resolusi layar diubah"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "Pengaturan efek partikel diubah"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "tidak ada teks"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Teks"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "mati"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "rendah"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "tinggi"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Efek partikel"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "sedang"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "maksimal"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "Detil partikel"
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "Perubahan akan memberikan efek saat pergantian peta."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2707,9 +2768,9 @@ msgid "Skill %d"
 msgstr "Skill %d"
 
 #: src/gui/skilldialog.cpp:438
-#, fuzzy, c-format
+#, c-format
 msgid "Skill: %s, Id: %d"
-msgstr "Skill %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
@@ -2722,7 +2783,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "Level: %d (%+d)"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Organisasi"
 
@@ -2754,7 +2815,7 @@ msgstr "Tinggalkan organisasi?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Kelompok"
 
@@ -2926,139 +2987,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Tidak ada target"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "Perbolehkan Target"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "Membutuhkan Target"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Sihir dasar"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Sihir kehidupan"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Sihir perang"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Sihir transmutasi"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Sihir alam"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "Sihir Astral"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "sihir"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "lainnya"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "Simbol:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Perintah:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Tipe target:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "Ikon:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Level sihir:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "Sekolah sihir:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "Level sekolah:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Simpan"
 
@@ -3286,7 +3347,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -3294,15 +3355,15 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3367,8 +3428,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Jika <nama> mempunyai spasi, ditutup dengan tanda (\")."
 
@@ -3406,38 +3467,38 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
@@ -3577,864 +3638,864 @@ msgstr "Tempat penyimpanan"
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr "Jendela stat membunuh"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "Apakah kamu mengetahui jendela"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr "Salin barang-barang yang dipakai ke Setelan"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr "Tutup tab obrolan ini"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr "Garis obrolan sebelumnya"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr "Garis obrolan selanjutnya"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr "Kunci pengubah"
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) jalan normal"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?)bergerak ke target"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?)serangan"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) pukulan normal"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti pukulan tanpa pelindung"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr "(S) pukulan dengan pelindung"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?)mengambil"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) penampilan peta kosong"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b)penampilan peta hitam & putih"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magic"
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magic"
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magic"
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magic"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magic"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) serangan magic"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) pergi"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) pergi"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr "Perombakan game tidak diperbolehkan"
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4671,107 +4732,107 @@ msgstr ""
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr "perintah ini mengundang <nama> untuk menjadi bagian kelompok anda"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -4846,184 +4907,184 @@ msgstr ""
 msgid "Username permanently erased."
 msgstr "Username dihapus permanen."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s telah bergabung dengan kelompok"
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s tidak dapat bergabung dengan kelompok karena kelompok sudah penuh."
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Kamu membawa kurang dari setengah jumlah berat maksimal. Darah dapat "
@@ -5609,24 +5670,24 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 6729eb9ec..c4e0a7abc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,79 +11,83 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-02 19:43+0300\n"
-"PO-Revision-Date: 2012-02-02 16:45+0000\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "Schivato"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:953 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:960 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:965 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:970
+#: src/client.cpp:990
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Accesso all'account"
 
-#: src/client.cpp:1116
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
-#: src/client.cpp:1217
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
-#: src/client.cpp:1252
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
-#: src/client.cpp:1305 src/client.cpp:1312 src/client.cpp:1446
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -93,272 +97,268 @@ msgstr "Cambiamento server del gioco"
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:1321
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
-#: src/client.cpp:1347
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Cambia password"
 
-#: src/client.cpp:1348
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "Cambia Email"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
-#: src/client.cpp:1388
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
-#: src/client.cpp:1389
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
-#: src/client.cpp:1594 src/client.cpp:1627 src/client.cpp:1642
-#: src/client.cpp:2074 src/client.cpp:2081
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
-#: src/client.cpp:1780
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
-#: src/client.cpp:1814 src/client.cpp:1820
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1841
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Comando sconosciuto."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Impossibile inviare un sussurro vuoto!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, 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."
+msgstr "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure sei tu."
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Richiesta per accedere al canale %s."
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "Manca il nome della gilda."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Attiva/disattiva la chat."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "I messaggi chiudono la conversazione."
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Attiva/disattiva la chat adesso."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la chat."
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "Amico"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "Disprezzato"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "Neutrale"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "Il giocatore è già %s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Il giocatore è stato %s con successo!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Il giocatore non può essere %s!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "Il giocatore non era ignorato!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "Giocatore non più ignorato!"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "Impossibile annullare l'ignoro!"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "Il giocatore è già cancellato!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "Giocatore cancellato dal tuo schermo con successo!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "Il giocatore non può essere cancellato!"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
 #: src/commandhandler.h:34
 #, 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\"."
+msgstr "Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" (falso), \"1\", \"0\"."
 
-#: src/game.cpp:254 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Generale"
 
-#: src/game.cpp:258 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "Debug"
 
-#: src/game.cpp:510
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr "Screenshot salvato come"
 
-#: src/game.cpp:518
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
-#: src/game.cpp:560
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
-#: src/game.cpp:561
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Errore di rete"
 
-#: src/game.cpp:1273
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
-#: src/game.cpp:1283
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
-#: src/game.cpp:1797
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr "Impossibile caricare la mappa."
 
-#: src/game.cpp:1798
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
@@ -387,24 +387,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr "Bot Checker"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Nome"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:137
-#: src/gui/popupmenu.cpp:307 src/gui/popupmenu.cpp:672
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Attacco"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:296
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Parla"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:268
-#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:481
-#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:825
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr "Movimento"
 
@@ -417,8 +417,8 @@ msgid "Reset"
 msgstr "Reimposta"
 
 #: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
-#: src/gui/popupmenu.cpp:297 src/gui/popupmenu.cpp:750
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Compra"
 
@@ -436,7 +436,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -444,30 +444,30 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Esci"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Massimo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Negozio"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
-#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
 #: src/gui/selldialog.cpp:93
 msgid "Sell"
@@ -477,18 +477,18 @@ msgstr "Vendi"
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
 #: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
-#: src/gui/popupmenu.cpp:348 src/gui/popupmenu.cpp:385
-#: src/gui/popupmenu.cpp:522 src/gui/popupmenu.cpp:550
-#: src/gui/popupmenu.cpp:576 src/gui/popupmenu.cpp:592
-#: src/gui/popupmenu.cpp:613 src/gui/popupmenu.cpp:841
-#: src/gui/popupmenu.cpp:867 src/gui/popupmenu.cpp:1850
-#: src/gui/popupmenu.cpp:1880 src/gui/popupmenu.cpp:1938
-#: src/gui/popupmenu.cpp:1985 src/gui/popupmenu.cpp:2022
-#: src/gui/popupmenu.cpp:2063 src/gui/popupmenu.cpp:2117
-#: src/gui/popupmenu.cpp:2139 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1198
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
-#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:168
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -524,7 +524,7 @@ msgstr "Gli indirizzi email immessi non coincidono."
 msgid "Change Password"
 msgstr "Cambia la Password"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:96
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Password:"
@@ -556,7 +556,7 @@ msgid "New Character"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
-#: src/gui/logindialog.cpp:95 src/gui/register.cpp:75
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
 
@@ -592,7 +592,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
-#: src/gui/socialwindow.cpp:1260
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Crea"
 
@@ -660,8 +660,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Elimina"
 
@@ -679,6 +679,7 @@ msgid "(empty)"
 msgstr "(vuoto)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "Predefinito"
 
@@ -735,25 +736,24 @@ msgid "rainbow 3"
 msgstr "Arcobaleno 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
-#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
@@ -766,18 +766,18 @@ msgstr "Sì"
 msgid "No"
 msgstr "No"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:167
-#: src/gui/popupmenu.cpp:175 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
-#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:684
-#: src/gui/popupmenu.cpp:692 src/gui/popupmenu.cpp:701
-#: src/gui/popupmenu.cpp:715
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Mappa"
 
@@ -852,90 +852,104 @@ msgstr ""
 msgid "Particle count: %d"
 msgstr "Conto particelle: %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Target:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "Target ID:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
-msgstr "Livello Target"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
-msgstr "Party del Target:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
-msgstr "Gilda del Target"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Livello Target"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Party del Target:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Gilda del Target"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "In: %d bytes/s"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Out: %d bytes/s"
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
-#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:114
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:66
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -970,12 +984,12 @@ msgstr "Equipaggiamento"
 
 #: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
 #: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1908
-#: src/gui/popupmenu.cpp:1955
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Togli"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Aiuto"
 
@@ -1013,31 +1027,31 @@ msgid "Filter:"
 msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
-#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
-#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Equipaggia"
 
 #: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
-#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
-#: src/gui/popupmenu.cpp:1875 src/gui/popupmenu.cpp:1914
-#: src/gui/popupmenu.cpp:1961
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Usa"
 
 #: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
-#: src/gui/popupmenu.cpp:1823 src/gui/popupmenu.cpp:1919
-#: src/gui/popupmenu.cpp:1966
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr "Lascia..."
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1832
-#: src/gui/popupmenu.cpp:1928 src/gui/popupmenu.cpp:1975
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Dividi"
 
 #: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
-#: src/gui/popupmenu.cpp:588
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr "Attrezzatura"
 
@@ -1046,17 +1060,17 @@ msgid "Weight:"
 msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1931
-#: src/gui/popupmenu.cpp:1978 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Magazzino"
 
-#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1839
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Recupera"
 
-#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1828
-#: src/gui/popupmenu.cpp:1924 src/gui/popupmenu.cpp:1971
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Lascia"
@@ -1106,91 +1120,91 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Statistiche uccisioni"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "Reset statistiche"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "Reset timer"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
@@ -1198,43 +1212,43 @@ msgstr ""
 msgid "You have left the guild."
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
+#: src/gui/logindialog.cpp:60
 msgid "Normal"
 msgstr "Normale"
 
-#: src/gui/logindialog.cpp:60
+#: src/gui/logindialog.cpp:61
 msgid "Auto Close"
 msgstr "Chiusura automatica"
 
-#: src/gui/logindialog.cpp:61
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr "Salta"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:124
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Autenticazione"
 
-#: src/gui/logindialog.cpp:92 src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:97
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr "Aggiornamento host"
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr "Ricorda username"
 
-#: src/gui/logindialog.cpp:112
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr "Aggiornamento:"
 
-#: src/gui/logindialog.cpp:122 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registra"
 
-#: src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr "Cambia server"
 
@@ -1291,11 +1305,11 @@ msgid "Submit"
 msgstr "Invia"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr "Cancella"
 
@@ -1330,355 +1344,355 @@ msgstr "Rimuovi prima"
 msgid "Away outfit"
 msgstr "Away outfit"
 
-#: src/gui/popupmenu.cpp:136 src/gui/popupmenu.cpp:671
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Commercia"
 
-#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:405
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:676
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:429
-#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
-#: src/gui/popupmenu.cpp:683 src/gui/popupmenu.cpp:691
-#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:714
-#: src/gui/popupmenu.cpp:727
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:159
-#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
-#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:450
-#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693
-#: src/gui/popupmenu.cpp:716
-msgid "Black list"
-msgstr ""
-
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415
-#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
-#: src/gui/popupmenu.cpp:702
-msgid "Set as enemy"
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:188
-#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:424
-#: src/gui/popupmenu.cpp:432 src/gui/popupmenu.cpp:438
-#: src/gui/popupmenu.cpp:443 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
 #: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
-#: src/gui/popupmenu.cpp:703 src/gui/popupmenu.cpp:709
-#: src/gui/popupmenu.cpp:717 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:187
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:436 src/gui/popupmenu.cpp:442
-#: src/gui/popupmenu.cpp:447 src/gui/popupmenu.cpp:455
-#: src/gui/popupmenu.cpp:699 src/gui/popupmenu.cpp:707
-#: src/gui/popupmenu.cpp:713 src/gui/popupmenu.cpp:721
-#: src/gui/popupmenu.cpp:726
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:194
-#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:457
-#: src/gui/popupmenu.cpp:708 src/gui/popupmenu.cpp:728
-#: src/playerrelations.cpp:465
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:465
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:815
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
-#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:212 src/gui/popupmenu.cpp:769
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:217 src/gui/popupmenu.cpp:477
-#: src/gui/popupmenu.cpp:774
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:232 src/gui/popupmenu.cpp:244
-#: src/gui/popupmenu.cpp:494 src/gui/popupmenu.cpp:791
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:237 src/gui/popupmenu.cpp:249
-#: src/gui/popupmenu.cpp:499 src/gui/popupmenu.cpp:796
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:257 src/gui/popupmenu.cpp:507
-#: src/gui/popupmenu.cpp:805
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:265
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:267
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:269 src/gui/popupmenu.cpp:739
-#: src/gui/popupmenu.cpp:828
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
-#: src/gui/popupmenu.cpp:829 src/gui/popupmenu.cpp:2136
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:301
-#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741
-#: src/gui/popupmenu.cpp:830
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
-#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
-#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:312
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:323
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:328
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:330
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:345 src/gui/popupmenu.cpp:519
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:358 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Giocatori"
 
-#: src/gui/popupmenu.cpp:546
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
-#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
-#: src/gui/popupmenu.cpp:566
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:568 src/gui/popupmenu.cpp:2095
-#: src/gui/popupmenu.cpp:2106 src/gui/popupmenu.cpp:2110
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:574
 msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:589
+#: src/gui/popupmenu.cpp:590
 msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr "Spells"
 
-#: src/gui/popupmenu.cpp:609
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:636
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
-#: src/gui/popupmenu.cpp:638
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
-#: src/gui/popupmenu.cpp:640
+#: src/gui/popupmenu.cpp:641
 msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:644
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:646
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1262
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr "Lascia"
 
-#: src/gui/popupmenu.cpp:654
+#: src/gui/popupmenu.cpp:655
 msgid "Copy to clipboard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:849
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr "Rinomina mappa"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1337
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr "Nome:"
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1382
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1384
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1786
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr "Aggiungi allo scambio"
 
-#: src/gui/popupmenu.cpp:1790
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr "Salva 10"
 
-#: src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr "Salva metà"
 
-#: src/gui/popupmenu.cpp:1804
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr "Salva tutto"
 
-#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
-#: src/gui/popupmenu.cpp:1967
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
-#: src/gui/popupmenu.cpp:1844
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
-#: src/gui/popupmenu.cpp:1845
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
-#: src/gui/popupmenu.cpp:1878 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr "Carica vecchie scorciatoie oggetti"
 
-#: src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr "Carica vecchie scorciatoie drop"
 
-#: src/gui/popupmenu.cpp:2011 src/gui/popupmenu.cpp:2048
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr "Nascondi"
 
-#: src/gui/popupmenu.cpp:2017 src/gui/popupmenu.cpp:2054
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr "Mostra"
 
-#: src/gui/popupmenu.cpp:2060
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
-#: src/gui/socialwindow.cpp:1017 src/gui/socialwindow.cpp:1052
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2092 src/gui/popupmenu.cpp:2103
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2094 src/gui/popupmenu.cpp:2105
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
@@ -1747,25 +1761,25 @@ msgstr "Connetti"
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Modifica"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloading server list... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "Attesa del server..."
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Preparazione download"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "Errore nel ricevimento della lista sei server!"
 
@@ -1778,157 +1792,188 @@ msgstr "Richiede una versione più nuova"
 msgid "requires v%s"
 msgstr "Richiede v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Abilita audio"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "Abilita musica"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "Abilita game sfx"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "Abilita gui sfx"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "Abilita musica"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "Abilita chat vocale mumble"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "Scarica musica"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Audio"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Volume effetti sonori"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Volume musica"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Avviso"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
 msgstr ""
-"Potrebbe essere necessario riavviare il client se si desidera scaricare "
-"nuova musica"
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Ingenieria suono"
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "Abilita chat vocale mumble"
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "Scarica musica"
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Colori"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Rimuovi colori dei messaggi ricevuti in chat"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Mostra colori per la chat"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Autorizza i comandi delle magie e dei GM per tutte le tabelle di chat"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Limita un massimo di caratteri per messaggio"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Limita un massimo di messaggi per la chat"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "Abilita I logs della chat"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Mostra la storia della chat"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Nascondi i messaggi del negozio"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Sposta tutti i sussurri in schede"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "Salva i messaggi delle magie nella debug tab"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Mostra i messaggi del server nella chat di debug"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "Abilita la chat di commercio"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "Abilita la chat di battaglia"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "Mostra gli eventi della battaglia"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr ""
 
@@ -1979,40 +2024,40 @@ msgstr "blu"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Applica"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Resetta finestre"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Premi il pulsante per cominciare la calibrazione"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Calibra"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Abilita joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Ferma"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -2035,456 +2080,460 @@ msgstr "Predefinito"
 msgid "Key Conflict(s) Detected."
 msgstr "Sono stati rilevati conflitti nei tasti."
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "Varie"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Mostri"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Mostra danno afflitto ai nemici"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "Target automatico solo sui nemici raggiungibili"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Evidenzia distanza massima di attacco del nemico"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "Mostra la barra hp dei nemici, punti vita"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "Ciclo di target sui nemici"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr "Mostra le particelle per le transizioni di mappa"
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "Evidenzia i cambiamenti di mappa"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Evidenzia oggetti sul terreno"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Evidenzia distanza massima d'attacco"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "Traccia sentiero"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr "Mostra hotkeys sulla mappa"
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr ""
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "Correggi posizione automaticamente"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "Attacca in movimento"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "Sincronizza movimenti giocatore"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "Movimento matto \"A\""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Mostra la mia barra hp"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "Abilita statistiche veloci"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "Ciclo di target sui giocatori"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "Mostra messaggi riguardo all'esperienza - punti lavoro"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "Mostra barra lavoro"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Accetta richieste di vendita/acquisto"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "Abilita la modalità negozio"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "Log dialoghi NPC"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Abilita il bot checker"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "Abilita i log di debug"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "Modalità basso traffico"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr "Nascondi lo scudo"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Mostra sfondo"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "Accellerazione hw"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Mostra il sesso"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Mostra il livello"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Mostra il proprio nome"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "Target sui personaggi morti"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Nomi visibili"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relazione"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutrale"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Amico"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Disprezzato"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignorato"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Cancellato"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Permetti scambi"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Permetti sussurri"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Vecchio"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Quando si ignora:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Minuscolo (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Piccolo (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Medio (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "Tema Gui"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "Font principale"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Font in grassetto"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "Font con particelle"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "Help font"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Dimensione caratteri"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Tema cambiato"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
@@ -2500,162 +2549,162 @@ msgstr "OpenGL veloce"
 msgid "Safe OpenGL"
 msgstr "OpenGL sicuro"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Nessun testo"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Testo"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Nuvolette senza nomi"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Nuvolette con nomi"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "Spento"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "Basso"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "Alto"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "medio"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "massimo"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Schermo intero"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Effetti particelle"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Mostra notifica pickup"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "in chat"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "come particelle"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "Limite Alt FPS:  "
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr "Testo sovrastante"
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "Opacità IU"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "Suoni ambientali"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "Dettaglio particelle"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "Nessuno"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Cambio verso la modalità finestra fallito e anche il ripristino modalità "
-"precedente è fallito!"
+msgstr "Cambio verso la modalità finestra fallito e anche il ripristino modalità precedente è fallito!"
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Cambio verso la modalità schermo intero fallito e anche il ripristino della "
-"modalità precedente è fallito!"
+msgstr "Cambio verso la modalità schermo intero fallito e anche il ripristino della modalità precedente è fallito!"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Cambiamento a schermo intero"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Cambiamento a OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Risoluzione scelta (esempio 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "Nuova risoluzione:                                         "
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "RIsoluzione schermo cambiata"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
+msgstr "Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione ridotta"
+
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
 msgstr ""
-"Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione "
-"ridotta"
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "Impostazioni effetti particelle cambiate."
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Opacità IU"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Nessun testo"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Testo"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Nuvolette senza nomi"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Nuvolette con nomi"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Testo sovrastante"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "Spento"
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "I cambi saranno effettuati al cambio della mappa."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "Basso"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "Alto"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Suoni ambientali"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Effetti particelle"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "medio"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "massimo"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "Dettaglio particelle"
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2704,6 +2753,14 @@ msgstr "Su"
 msgid "Skill points available: %d"
 msgstr "Punti abilità disponibili: %d"
 
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
@@ -2714,6 +2771,11 @@ msgstr "Abilità impostata %d"
 msgid "Skill %d"
 msgstr "Abilità %d"
 
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
@@ -2724,204 +2786,204 @@ msgstr "Lvl: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "Lvl: %d (%+d)"
 
-#: src/gui/socialwindow.cpp:144 src/gui/socialwindow.cpp:242
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Gilda"
 
-#: src/gui/socialwindow.cpp:173
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Invitato utente %s alla gilda %s."
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Abbandono gilda %s richiesto."
 
-#: src/gui/socialwindow.cpp:214
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr "invita qualcuno nel gruppo"
 
-#: src/gui/socialwindow.cpp:215
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Chi vorresti invitare alla gilda %s?"
 
-#: src/gui/socialwindow.cpp:224
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr "Lasciare la gilda?"
 
-#: src/gui/socialwindow.cpp:225
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Sei sicuro di voler lasciare la gilda %s?"
 
-#: src/gui/socialwindow.cpp:345 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Party"
 
-#: src/gui/socialwindow.cpp:373
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Invitato utente al gruppo %s"
 
-#: src/gui/socialwindow.cpp:387
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Abbandono gruppo %s richiesto"
 
-#: src/gui/socialwindow.cpp:414
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr "Invita qualcuno nel gruppo"
 
-#: src/gui/socialwindow.cpp:415
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Chi vorresti invitare al gruppo %s?"
 
-#: src/gui/socialwindow.cpp:424
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr "Lasciare il gruppo?"
 
-#: src/gui/socialwindow.cpp:425
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Sei sicuro di voler lasciare il gruppo %s?"
 
-#: src/gui/socialwindow.cpp:649
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr "Nav"
 
-#: src/gui/socialwindow.cpp:927
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:968
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1000
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1035
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1195
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Crea una Gilda"
 
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr "Crea gruppo"
 
-#: src/gui/socialwindow.cpp:1238 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr "Sociale"
 
-#: src/gui/socialwindow.cpp:1261
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr "Invita"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1277
+#: src/gui/socialwindow.cpp:1278
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1281
+#: src/gui/socialwindow.cpp:1282
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1414
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accettato invito al gruppo da parte di %s"
 
-#: src/gui/socialwindow.cpp:1424
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rifiutato invito al gruppo da parte di %s"
 
-#: src/gui/socialwindow.cpp:1441
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accettato invito alla gilda da parte di %s"
 
-#: src/gui/socialwindow.cpp:1454
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rifiutato invito alla gilda da parte di %s"
 
-#: src/gui/socialwindow.cpp:1501
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Stai creando una gilda chiamata %s"
 
-#: src/gui/socialwindow.cpp:1524
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr "Stai creando un party chiamato %s"
 
-#: src/gui/socialwindow.cpp:1538
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr "Nome della gilda"
 
-#: src/gui/socialwindow.cpp:1539
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr "Scegli un nome per la tua gilda"
 
-#: src/gui/socialwindow.cpp:1553
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr "Ricevuto invito ad una gilda, ma ne hai già una."
 
-#: src/gui/socialwindow.cpp:1559
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s ti ha invitato ad entrare nella gilda %s"
 
-#: src/gui/socialwindow.cpp:1565
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr "Accetta invito alla gilda"
 
-#: src/gui/socialwindow.cpp:1580
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr "Sei stato invitato ad entrare in un party"
 
-#: src/gui/socialwindow.cpp:1595
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sei stato invitato ad entrare nel gruppo %s"
 
-#: src/gui/socialwindow.cpp:1603
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
-#: src/gui/socialwindow.cpp:1608
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
-#: src/gui/socialwindow.cpp:1617
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#: src/gui/socialwindow.cpp:1632
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr "Impossibile creare un party, sei già in un party"
 
-#: src/gui/socialwindow.cpp:1637
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr "Nome del gruppo"
 
-#: src/gui/socialwindow.cpp:1638
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr "Scegli un nome per il tuo party"
 
@@ -2929,139 +2991,139 @@ msgstr "Scegli un nome per il tuo party"
 msgid "Specials"
 msgstr "Speciali"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Livello: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Soldi: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Esperienza:"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Lavoro: %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Lavoro:"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Livello: %d (GM:%d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Nessun target"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "Permetti target"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "Target richiesto"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Magia"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Magia della vita"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Magia della guerra"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Magia della transmutazione"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Magia della natura"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "Magia astrale"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "Editor dei comandi"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "altro"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "Simbolo:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Tipo di target:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "Icona:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Livello magico:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "Scuola di magia:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "Livello scuola:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Salva"
 
@@ -3105,42 +3167,40 @@ msgstr "Non hai abbastanza denaro."
 #: src/gui/tradewindow.cpp:454
 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."
+msgstr "Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla finestra."
 
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: src/gui/updaterwindow.cpp:139
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Aggiornamento..."
 
-#: src/gui/updaterwindow.cpp:166
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: src/gui/updaterwindow.cpp:169
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Gioca"
 
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1 L'aggiornamento è stato completato."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:572
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:574
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr "##1  riprova più tardi"
 
-#: src/gui/updaterwindow.cpp:750
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Completato"
 
@@ -3292,7 +3352,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "Chi è online - Aggiornamento in corso"
 
@@ -3300,15 +3360,15 @@ msgstr "Chi è online - Aggiornamento in corso"
 msgid "Update"
 msgstr "Aggiornamento"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "Chi è online -   "
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "Chi è online - errore"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Chi è online - aggiornamento"
 
@@ -3373,16 +3433,14 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Questo comando rende <nick> un operatore del canale"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se il <nick> contiene spazi, racchiuderlo tra virgolette (\")."
 
 #: src/gui/widgets/channeltab.cpp:87
 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."
+msgstr "Gli operatori possono rendere operatiori o cacciare gli altri utenti dal canale."
 
 #: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
@@ -3414,38 +3472,38 @@ msgstr "Annuncio generale da %s:"
 msgid "%s whispers: %s"
 msgstr "%s sussurra: %s "
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
@@ -3475,8 +3533,7 @@ msgstr "Comando: /ignore"
 
 #: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
-msgstr ""
-"Questo comando ignora l'altro giocatore, senza tenere conto delle relazioni"
+msgstr "Questo comando ignora l'altro giocatore, senza tenere conto delle relazioni"
 
 #: src/gui/widgets/whispertab.cpp:130
 msgid "Command: /unignore <player>"
@@ -3485,9 +3542,7 @@ msgstr "Comando: /unignore <giocatore>"
 #: src/gui/widgets/whispertab.cpp:131
 msgid ""
 "This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Questo comando smette di ignorare l'altro giocatore se è stato ignorato in "
-"precedenza"
+msgstr "Questo comando smette di ignorare l'altro giocatore se è stato ignorato in precedenza"
 
 #: src/gui/windowmenu.cpp:65
 msgid "BC"
@@ -3589,859 +3644,865 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Muoviti verso l'alto"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Muoviti verso il basso"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Muoviti verso sinistra"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Muoviti verso destra"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Mirino e attacco"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "Muovi all'obbiettivo"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Ferma attacco"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "Seleziona il più vicino"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Punta NPC"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Punta Giocatore"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Raccogli"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "Cambia modo di raccogliere"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Nascondi la Finestra"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Siediti"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Abilita/Disabilita Scambi"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "Cambia visualiz. mappa"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "Seleziona OK"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Scorciatoia %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Finestra di Aiuto"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Finestra degli Status"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Finestra dell'Inventario"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Finestra dell'Equipaggiamento"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Finestra delle Capacità"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Finestra Minimappa"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Finestra della Chat"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Finestra Scorciatoia Oggetti"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Finestra del Setup"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Finestra di debug"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Attiva Chat"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Scorre la chat in alto"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Scorre la chat in basso"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Scheda Chat Precedente"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Scheda Chat Successiva"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ignora input 1"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ignora input 2"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "On / Off audio"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "Abilita / Disabilita modalità away"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
-"Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare "
-"inconvenienti"
+msgstr "Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare inconvenienti"
 
-#: src/localplayer.cpp:385
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1443
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "L'oggetto è troppo pesante"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "L'inventario è pieno"
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1455
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1458
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1482
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Hai raccolto %d  [@@%d|%s@@]."
 msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1902
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1903
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1904
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1905
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1934
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1952
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1953
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1954
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1955
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1979
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1980
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1981
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1982
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2002 src/localplayer.cpp:2006 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2003 src/localplayer.cpp:2025
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2004
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2005
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2026
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2027
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2028
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2062
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2063
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2064
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2065
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2066
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2067
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2068
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2069
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2082
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2083
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2110
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2111
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2131
-msgid "(f) attack not friends"
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2133
-msgid "(d) dont attack players"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2134
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2183
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "Assente"
 
-#: src/localplayer.cpp:2202
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2203
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2204 src/localplayer.cpp:2219
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2217
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2218
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2243
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2244
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2245
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3763
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3765 src/localplayer.cpp:3780
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3782
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4130
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Opzioni"
 
-#: src/main.cpp:57
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:75
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:76
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:80
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4497,7 +4558,7 @@ msgstr ""
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:245
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
@@ -4678,107 +4739,107 @@ msgstr ""
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -4790,255 +4851,248 @@ msgstr ""
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr "La vecchia password è sbagliata."
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:251
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr "Errore sconosciuto."
 
-#: src/net/ea/loginhandler.cpp:213
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:216
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:219
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:222
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:225
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:229
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:232
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:239
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:242
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:248
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Sei morto."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 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."
+msgstr "Ci dispiace informarti che il tuo personaggio è stato ucciso in battaglia."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Non sei più così vivo."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 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/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 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."
+msgstr "No, figliolo. Il tuo personaggio non è veramente morto. È... ehm... andato in un posto migliore."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 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."
+msgstr "Il tuo piano di spezzare le armi dei tuoi nemici colpendole con la tua gola ha fallito."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Suppongo non sia andata troppo bene."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Vuoi che i tuoi beni siano identificati?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Tristemente, nessuna traccia di te è stata mai trovata..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Annichilito."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Hai combinato un altro disastro, getta il tuo corpo nelle fogne e prenditene"
-" uno nuovo."
+msgstr "Hai combinato un altro disastro, getta il tuo corpo nelle fogne e prenditene uno nuovo."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain "
 "health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -5432,8 +5486,7 @@ msgstr "Account bannato."
 
 #: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
-msgstr ""
-"Il tentativo di login è stato fatto troppo presto dopo l'ultimo tentativo."
+msgstr "Il tentativo di login è stato fatto troppo presto dopo l'ultimo tentativo."
 
 #: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
@@ -5623,24 +5676,24 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s non è nel tuo party!"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
@@ -5672,5 +5725,3 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
-
-
diff --git a/po/ja.po b/po/ja.po
index cb90a39b0..9f70fd201 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,80 +12,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-05 23:09+0000\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
-"ja/)\n"
+"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/"
+"language/ja/)\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "マップ�表示��る"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr "人間"
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "ドッジ"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "パフォーマンス"
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr "テーマ"
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "サー�ー�接続�����"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "ログイン�����"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "ゲーム�世界�移動�����"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "キャラクターを呼�出�����"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "ゲームサー�ー�接続�����"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "ゲームサー�ーを変更�����"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -95,63 +99,63 @@ msgstr "ゲームサー�ーを変更�����"
 msgid "Error"
 msgstr "エラー"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "登録内容を呼�出�����"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "パスワード変更"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "パスワードを変更����"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更����"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "登録を解除����"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "�よ��ら　��会���ょ�"
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s�存在���為�作�����ん"
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "無効�アップデートホスト:%s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "更新フォルダ�作�エラー"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s �存在���為�作�����ん"
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "�明�コマンド��"
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "空���や�を�信�る�������ん"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,155 +164,155 @@ msgstr ""
 "%s����や�タブ�作��失敗����。��タブ�既�開���る�も���自"
 "分宛���"
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "%s�ャン�ル���加をリクエスト中"
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "パーティ���り��ん"
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "ギルド���り��ん"
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "��を入力������"
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "改行キー��ャット入力�����"
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "�ャットを閉���"
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "改行キー��ャット入力�����"
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "�ャットを閉���"
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "��"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "無視"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "プレイヤー�既�%s"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "プレイヤー�%s��功����"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "プレイヤーを%s������"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "プレイヤーを完全無視����ん���"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "プレイヤーを完全無視解除����"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "プレイヤーを完全無視解除����ん���"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr "ブラックリスト化�れ����"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr "敵"
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "プレイヤー�削除�れ����"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "プレイヤーを削除����"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "プレイヤーを削除����ん���"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアント�稼�時間: %s"
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d週"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%dæ—¥"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d時"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d分"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d秒"
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "フォントキャッシュサイズ"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr "キャッシュサイズ:"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "作�:"
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "削除:"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr "リソース孤�イメージ:"
 
@@ -318,11 +322,11 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "/%s���能�オプション�：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "デ�ッグ"
 
@@ -383,18 +387,18 @@ msgstr "コメント: %s"
 msgid "Bot Checker"
 msgstr "ボット�ェッカー"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "��"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "攻撃"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "話�"
 
@@ -432,7 +436,7 @@ msgstr "�:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -440,25 +444,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "終了"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "店"
 
@@ -482,8 +486,8 @@ msgstr "売る"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "キャンセル"
@@ -656,8 +660,8 @@ msgid "Enter password:"
 msgstr "パスワードを入力��下��:"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "削除"
 
@@ -675,6 +679,7 @@ msgid "(empty)"
 msgstr "(空)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "デフォルト"
 
@@ -720,36 +725,35 @@ msgstr "茶色"
 
 #: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
-msgstr "虹 1"
+msgstr "カラフル1"
 
 #: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
-msgstr "虹 2"
+msgstr "カラフル 2"
 
 #: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
-msgstr "虹 3"
+msgstr "カラフル 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "�ャット"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "�在: %s; %d プレイヤー����"
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%s���や�中:%s"
@@ -770,10 +774,10 @@ msgstr "���"
 #: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
 #: src/gui/popupmenu.cpp:716
 msgid "Ignore"
-msgstr "完全無視"
+msgstr "無視"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "マップ"
 
@@ -848,62 +852,76 @@ msgstr "テクス�ャー数:"
 msgid "Particle count: %d"
 msgstr "パーティクル数:%d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "ターゲット:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "ターゲットID:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr "ターゲットレベル:"
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr "ターゲット種別:"
+
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr "ターゲットパーティ:"
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr "ターゲットギルド:"
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "攻撃�延"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr "最低ヒット:"
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr "最高ヒット:"
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr "クリティカルヒット:"
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "ターゲットレベル:"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "ターゲットパーティ:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "ターゲットギルド:"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "ピング: %s ms"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "入力: %d�イト/秒"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "出力: %d �イト/秒"
@@ -930,8 +948,8 @@ msgstr "次� >"
 msgid "Auto open this window"
 msgstr "��窓を自動�開�る"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -1043,7 +1061,7 @@ msgstr "��:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "�管"
 
@@ -1102,89 +1120,89 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "�力: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "キル統計"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "統計をリセット"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "タイマーをリセット"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "レベル: %d � %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d/%d 残り: %d"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, 平��敵 1%%: %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "キル: %s, �計exp: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "平�Exp: %s, 次�レベル�����敵�数: %s"
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "キル/分: %s, Exp/分: %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Expスピード %d 分��: %s"
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "次�レベルアップ %d 分��: %s"
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "最後�Exp:"
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr "次�JackO�出���:"
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  次�レベル�����時間: %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr "JackO�出�中"
 
@@ -1242,7 +1260,7 @@ msgstr "マナ"
 
 #: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
-msgstr "経験"
+msgstr "Exp�ー"
 
 #: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
@@ -1285,7 +1303,7 @@ msgid "Submit"
 msgstr "決定"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
@@ -1327,7 +1345,7 @@ msgstr "AFK中��装"
 #: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
-msgstr "交�"
+msgstr "トレード"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
@@ -1395,7 +1413,7 @@ msgstr "完全無視解除"
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -1485,13 +1503,13 @@ msgstr "攻撃リスト�追加�る"
 
 #: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
-msgstr "完全無視リスト�追加�る"
+msgstr "攻撃無視リスト�追加�る"
 
 #: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr "��を�ャット�追加�る"
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "プレイヤー"
 
@@ -1595,19 +1613,19 @@ msgstr "コメント:                      "
 
 #: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
-msgstr "トレード�追加"
+msgstr "トレードウィンドウ�追加"
 
 #: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
-msgstr "トレード�10追加�る"
+msgstr "トレードウィンドウ�10追加�る"
 
 #: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
-msgstr "トレード��分追加�る"
+msgstr "トレードウィンドウ��分追加�る"
 
 #: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
-msgstr "トレード�全�追加�る"
+msgstr "トレードウィンドウ�全�追加�る"
 
 #: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
@@ -1658,12 +1676,12 @@ msgstr "表示"
 msgid "Reset yellow bar"
 msgstr "黄色�ーをリセット�る"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "�ャット�コピー�る"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(デフォルト)"
@@ -1734,32 +1752,32 @@ msgstr "読込�"
 
 #: src/gui/serverdialog.cpp:263
 msgid "Connect"
-msgstr "ログイン"
+msgstr "接続"
 
 #: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
 #: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
 msgid "Add"
 msgstr "追加"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "編集"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "サー�ーリストをダウンロード中...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "サー�ー�ら�応答を待�����"
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "ダウンロード準備中..."
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "サー�ーリスト�読�込��失敗"
 
@@ -1772,156 +1790,188 @@ msgstr "アップデート�必���"
 msgid "requires v%s"
 msgstr "v%s�必�"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "オーディオ"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "オーディオを有効��る"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "音楽を有効��る"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "ゲームSFXを有効��る"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "GUI SFXを有効��る"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "音楽を有効��る"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "Mumble Voice Chatを有効��る"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "音楽をダウンロード�る"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "オーディオ"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Sfx音�"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "音楽�音�"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "�知ら�"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
-"新��音楽をダウンロード�る場��クライアントを�起動�る必���り��"
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "サウンドエンジン"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "��他"
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "Mumble Voice Chatを有効��る"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "音楽をダウンロード�る"
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "色"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "�信��メッセージ�色を無効��る"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "�ャット�文字色リストを表示"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "コマンド"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "全��タブ�呪文�GMコマンドをログ�る"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "制�"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "�ャット�一行�表示�る最大文字数を制��る"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "�ャット�表示�る最大行数を制��る"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "ログ"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "�ャットログを有効"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "�ャット履歴を表示"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "メッセージ"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "売買メッセージを隠�"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "タブ"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "��や�ををタブ�表示�る"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "デ�ッグタブ�呪文をログ�る"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
-msgstr "サー�ーメッセージをデ�ッグタブ�ログ�る"
+msgstr "デ�ッグタブ�サー�ーメッセージをログ�る"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "トレードタブを有効"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "�トルタブを有効"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "�トルイベントを表示"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr "�ャットタブをリサイズ�る"
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "時間"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "ローカルタイムを使�"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "��他"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr "文字を�イライト (コンマ�区切る)"
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr "MVPメッセージを表示�る"
 
@@ -1945,7 +1995,7 @@ msgstr "点滅"
 #: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
 #: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
-msgstr "虹"
+msgstr "カラフル"
 
 #: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
 #: src/gui/setup_colors.cpp:409
@@ -1972,41 +2022,41 @@ msgstr "�:"
 msgid "Alpha:"
 msgstr "アルファ:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "�用"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "ウィンドウをリセット�る"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "ボタンを押��カリブレーションを開始"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "カリブレーション"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "ジョイスティックを使用�能��る"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr "クライアント�無効�場�ジョイスティックを使用"
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "ジョイスティック"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "�止"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
-msgstr "スティック�円を��ボタン�押���"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2028,459 +2078,463 @@ msgstr "標準�戻�"
 msgid "Key Conflict(s) Detected."
 msgstr "ショートカットキー��複�����"
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "��他"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "モンスター"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "モンスター�与��ダメージを表示�る"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "攻撃�能範囲�モンスター��"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "モンスター�攻撃範囲を強調表示"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "モンスター�HP�ーを表示�る"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "�択��モンスターを円�表示"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr "ワープパーティクルを表示"
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "マップ�ータルを強調表示"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "床�����るアイテムを強調表示"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "攻撃�能範囲を強調表示"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr "拡張ミニマップを表示�る"
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "パスを表示��る"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr "マップ�ホットキーを表示��る"
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr "レイジースクロールを有効��る"
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr "レイジースクロール"
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr "ラディアススクロール"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "動作"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "自動��置を修正"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "移動中も攻撃�る"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "プレイヤー�動�を�化�る"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "クレイジームーブ A プログラム"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "プレイヤー"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "自分�HP�ーを表示�る"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "クイックスタッツを有効��る"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "�択��プレイヤーを円�表示"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "ジョブExpメッセージを表示�る"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "プレイヤー�ップアップを表示�る"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr "AFKメッセージ"
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "ジョブを表示�る"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr "攻撃フィルターを有効��る"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr "アド�ートプロトコルを有効��る"
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "売買リクエストを��入れる"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "ショップモードを有効��る"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "NPCダイアログを記録�る"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr "ボットサ�ート"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr "オークションボット�サ�ート"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr "ギルドサ�ートを無効��ギルドボットを有効��る"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr "サー�ーサイドアタックを有効��る"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "ボット�ェッカーを有効��る"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "�安定�サー�ー�護を有効��る(無効����)"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "デ�ッグログを有効��る"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "低トラフィックモード"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr "シールドスプライトを隠�"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "背景を表示�る"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 "より良�パフォーマンス (より良�パフォーマンス�為��有効���下��)"
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr "パフォーマンスを自動調整"
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "�ードウェアアクセラレーション"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 "��キャッシュを有効化�る (ソフトウェア-メモリを沢山使用�る�能性��り�"
 "�)"
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr "マップ削減を有効化 (ソフトウェア)"
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr "より良�クオリティ (より良�パフォーマンス�為��無効���下��)"
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "アルファ�ャン�ル修正を有効化 (ソフトウェア-���る�能性��り��)"
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr "��を表示�る"
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr "スプライトリオーダーを有効��る."
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr "メモリ優先 (メモリ使用を少���る��有効���下��)"
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr "アド�ンスキャッシュを無効��る (ソフトウェア)"
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr "キャッシュを無効��る (ソフトウェア)"
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "性別を表示�る"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "レベルを表示�る"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "自分���を表示�る"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr "エクステンドマウスターゲットを有効��る"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "死ん�プレイヤー�標的を有効"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "��を表示�る"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr "トレードを安全化�る"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr "セキュリティ上安全����文字���れ����"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr "ステータスを表示�る"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr "スクリーンショット�IPを表示��る"
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr "クリック�ヒール"
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr "オンラインリストをグループ化�る"
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "関係"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "普通"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "��"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "無視���る"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "完全無視���る"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "削除済"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr "ブラックリスト化�れ����"
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr "敵"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "トレードを�付�る"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "全����や�を���る"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "��"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "関係"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "完全無視�際��:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "��� (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "å°� (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "中 (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "大1 (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "大2 (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "最大 (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr "中国語 (中国)"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr "�ェコ語"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr "英語"
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr "フィンランド語"
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr "フランス語"
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr "ドイツ語"
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr "インド�シア語"
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr "�ーランド語"
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr "日本語"
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr "ドイツ語 (ベルギー/フランドル)"
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr "�ルトガル語"
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr "�ルトガル語 (ブラジル)"
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr "ロシア語"
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr "スペイン語 (カスティリヤ)"
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "テーマ"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "GUIテーマ"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr "言語"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "メインフォント"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "太字フォント"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "パーティクルフォント"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "ヘルプフォント"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr "安全�フォント"
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr "日本語フォント"
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "フォントサイズ"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "テーマを変更����"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更�為アプリケーションを�起動������"
 
@@ -2496,156 +2550,162 @@ msgstr "速� OpenGL"
 msgid "Safe OpenGL"
 msgstr "セーフ OpenGL"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "テキスト��"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "テキスト"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "��出�,��表示��"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "��出�,��表示�り"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "オフ"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "低"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "高"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "中"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "最大"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
-msgstr "フールスクリーン"
+msgstr "フルスクリーン"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "カスタムカーソル"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "パーティクル効果"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "�集通知表示"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "�ャット�"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "画�内�"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr "リサイズを有効��る"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr "フレーム��"
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "FPSリミット:"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "Alt FPS リミット: "
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr "ヘッダーテキスト"
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "GUI��明"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "環境FX"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "パーティクル�詳細"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "��"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "ウインドウモード����モード�復元�も失敗����"
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "フルスクリーンモード����モード�復元�も失敗����"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "フルスクリーン�変更"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更�為��起動を������"
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "OpenGL�変更"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
-msgstr "OpenGL�設定を変更�る����起動を������。"
+msgstr "OpenGL�設定を変更�る����起動を������"
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "カスタム解�度 (例: 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "解�度を入力��下��:                "
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "スクリーン�解�度を変更����"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "解�度�変更����������ウィンドウ�移動�る�能性��り��"
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "パーティクル効果�設定を変更����"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "GUI��明"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "テキスト��"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "テキスト"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "��出�,��表示��"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "��出�,��表示�り"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "ヘッダーテキスト"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "オフ"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "低"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "高"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "環境FX"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "パーティクル効果"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "中"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "最大"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "パーティクル�詳細"
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "変更�マップ�変���時�有効��り��"
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2696,11 +2756,11 @@ msgstr "スキル�イント: %d"
 
 #: src/gui/skilldialog.cpp:385
 msgid "basic"
-msgstr ""
+msgstr "基本"
 
 #: src/gui/skilldialog.cpp:386
 msgid "Skill: basic, Id: 1"
-msgstr ""
+msgstr "スキル:基本� Id: 1"
 
 #: src/gui/skilldialog.cpp:420
 #, c-format
@@ -2715,7 +2775,7 @@ msgstr "スキル %d"
 #: src/gui/skilldialog.cpp:438
 #, c-format
 msgid "Skill: %s, Id: %d"
-msgstr ""
+msgstr "スキル: %s, Id: %d"
 
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
@@ -2728,7 +2788,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "Lvl: %d (%+d)"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "ギルド"
 
@@ -2760,7 +2820,7 @@ msgstr "ギルド�ら退会����？"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "ギルド %s�ら本当�退会����?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "パーティー"
 
@@ -2810,7 +2870,7 @@ msgstr "敵を攻撃�る"
 
 #: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
-msgstr "敵を完全無視�る"
+msgstr "無視���る敵"
 
 #: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
@@ -2836,7 +2896,7 @@ msgstr "周囲"
 #. TRANSLATORS: here F is title for friends tab in social window
 #: src/gui/socialwindow.cpp:1282
 msgid "F"
-msgstr "フレ"
+msgstr "��"
 
 #: src/gui/socialwindow.cpp:1415
 #, c-format
@@ -2932,139 +2992,139 @@ msgstr "パーティ�を�ん�����"
 msgid "Specials"
 msgstr "スペシャル"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "レベル: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "GP: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
-msgstr "経験値:"
+msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "ジョブ: %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "ジョブ�イント:"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr "キャラクター�イント: %d"
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "レベル: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr "修正点: %d"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "ターゲット��"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "ターゲットを有効��る"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "ターゲット必�"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "ジェ�ラル魔法"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "ライフ魔法"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "ウォー魔法"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "トランスミュート魔法"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "�イ�ャー魔法"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "アストラル魔法"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "コマンドエディタ"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "魔法"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "ä»–"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "シンボル:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "コマンド:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr "コメント:"
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "マナ:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "ターゲットタイプ:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "アイコン:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "魔法レベル:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "魔法学園:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "学校レベル:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "セーブ"
 
@@ -3086,7 +3146,7 @@ msgstr "了承����"
 
 #: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
-msgstr "交�:自分"
+msgstr "トレード:自分"
 
 #: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
@@ -3103,7 +3163,7 @@ msgstr "変更"
 
 #: src/gui/tradewindow.cpp:375
 msgid "You don't have enough money."
-msgstr "�金�足��"
+msgstr "GP�足��"
 
 #: src/gui/tradewindow.cpp:454
 msgid "Failed adding item. You can not overlap one kind of item on the window."
@@ -3208,7 +3268,7 @@ msgstr "�集通知"
 
 #: src/gui/userpalette.cpp:133
 msgid "Exp Notification"
-msgstr "経験値通知"
+msgstr "Exp通知"
 
 #: src/gui/userpalette.cpp:134
 msgid "Player HP bar"
@@ -3294,7 +3354,7 @@ msgstr "ホームボーダー"
 msgid "Road Point"
 msgstr "ロード�イント"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "オンラインリスト - アップデート中"
 
@@ -3302,15 +3362,15 @@ msgstr "オンラインリスト - アップデート中"
 msgid "Update"
 msgstr "アップデート"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "オンラインリスト - "
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "オンラインリスト - エラー"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "オンラインリスト - アップデート"
 
@@ -3320,23 +3380,23 @@ msgstr "�トル"
 
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
-msgstr "/users��在�る�ャン�ル�ユーザ�リストを表示���。"
+msgstr "/users��在�る�ャン�ル�ユーザ�リストを表示���"
 
 #: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
-msgstr "/topic��在�る��ャン�ル�トピックを表示���。"
+msgstr "/topic��在�る��ャン�ル�トピックを表示���"
 
 #: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
-msgstr "/quit��ャン�ルを去り��。"
+msgstr "/quit��ャン�ルを去り��"
 
 #: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
-msgstr "/op�ユーザーを�ャン�ル�オペレーター����。"
+msgstr "/op�ユーザーを�ャン�ル�オペレーター����"
 
 #: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
-msgstr "/kick�ユーザーを�ャン�ル�ら一時的�追�出���。"
+msgstr "/kick�ユーザーを�ャン�ル�ら一時的�追�出���"
 
 #: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
@@ -3375,8 +3435,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "��コマンド�入力��ユーザーを�ャン�ル�オペレータ�指定���"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 "入力�るニック�ーム�スペース���れ��る場��ダブルコーテーション(\"\")"
@@ -3418,38 +3478,38 @@ msgstr "%s�ら�アナウンス:"
 msgid "%s whispers: %s"
 msgstr "%s ��や�: %s"
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr "コマンド: /invite <プレイヤー�>"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr "��コマンド��入力��プレイヤーを自分�ギルド�招待���"
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr "コマンド: /leave"
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr "��コマンド�プレイヤーをギルド�ら退会����"
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr "/help > ヘルプメニューを表示"
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > プレイヤーをギルド�招待�る"
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > ギルド�ら退会�る"
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > プレイヤーをギルド�ら追�出���"
 
@@ -3589,869 +3649,869 @@ msgstr "倉庫"
 msgid "Cart"
 msgstr "カート"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr "標準キー"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "上�移動"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "下�移動"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "左�移動"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "��移動"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "ターゲット&攻撃"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "ターゲット��移動"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "ターゲット�接近方法変更"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr "ホーム�置��移動"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr "ホーム�置変更"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr "ナビゲーション�イント�移動"
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "攻撃を止�る"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr "ターゲット�ら外�"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "最も近�を目標��る"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "NPCを狙�"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "プレイヤーをターゲット"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "拾�"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "拾�方を変更"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "ウィンドウを隠�"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "座る"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "�引を有効/無効��る"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "マップビューモード変更"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "OKを�択�る"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr "ショートカットキー"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr "アイテムショートカットキー"
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "アイテムショートカット: %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr "ウィンドウズキー"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "ヘルプウィンドウ"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "ステータスウィンドウ"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "インベントリーウィンドウ"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "装�ウィンドウ"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "スキルウィンドウ"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "ミニマップウィンドウ"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "�ャットウィンドウ"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "アイテムショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "設定ウィンドウ"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "デ�グウィンドウ"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "ソーシャルウインドウ"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "スマイリーショートカットウィンドウ"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "�装ウインドウ"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr "ショップウィンドウ"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr "クイックドロップウィンドウ"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr "キルスタッツ窓"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr "コマンドウインドウ"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr "ボット�ェッカーウィンドウ"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "オンラインユーザーウインドウ"
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "豆知識窓"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr "�ソーシャルタブ"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr "次ソーシャルタブ"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr "スマイリーキー"
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "スマイリー"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "スマイリーショートカット: %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr "�装キー"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "�を�る"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr "�をコピー�る"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr "装��を�装�コピー"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr "�ャットキー"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "トグル�ャット"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "�ャットを上�スクロール�る"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "�ャットを下�スクロール�る"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "���ャットタブ"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "次��ャットタブ"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr "���ャットタブを閉�る"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr "��ャット文"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr "次�ャット文"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr "�ャットオートコンプリート"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr "�ャット入力無効"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr "��他�キー"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "インプット１完全無視"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "インプット２完全無視"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr "上方�"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr "下方�"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr "左方�"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr "�方�"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr "クレイジームーブ"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr "クレイジームーブモード変更"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Nアイテムを 0スロット�らクイックドロップ"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr "Nアイテムをクイックドロップ"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr "クイックドロップカウンター変更"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "ターゲット��自分をHP回復��る"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr "呪文 #itenplz を唱�る"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "魔法攻撃を使用"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr "マジックアタック変更"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr "PvP攻撃変更"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr "ムーブタイプ変更"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr "武器変更"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr "攻撃方法変更"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr "フォローモード変更"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr "真似モード変更"
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr "ゲームモディファイアキーを無効 / 有効��る"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "オーディオ　オン/オフ"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "AFKモードを有効 / 無効��る"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr "�クリックをエミュレート�る"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr "カメラモード変更"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
-msgstr "モディファイアーキー"
+msgstr "モディファイアキー"
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 "\"%s\"�\"%s\"キー��複�����。 ゲームプレイ�悪�影響�出る�も�れ��"
-"ん。"
+"ã‚“"
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "%s�よ��殺�れ���"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "存在���アイテム�拾���ん"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "アイテム������"
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "アイテム������."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "インベントリー�満���"
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr "��多����"
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "�れ�他�プレイヤー�アイテム��"
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr "�明�エラー�為拾���ん"
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "%d [@@%d|%s@@]を手�入れ���"
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
-msgstr ""
+msgstr "xp"
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
-msgstr ""
+msgstr "ジョブ"
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) デフォルトムーブ"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr "(I) 逆ムーブ"
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr "(c) クレイジームーブを�ん�ムーブ"
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr "(C) クレイジームーブ"
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) ダブルノーマル + クレイジー"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr "(?) �明�ムーブ"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) クレイジームーブ %d"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr "(a) カスタムクレイジームーブ"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr "(?) クレイジームーブ"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr "(0) ターゲット�デフォルト接近"
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr "(1) �離1�ターゲット�接近"
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr "(2) �離2�ターゲット�近付�"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr "(3) �離3�ターゲット�接近"
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr "(5) �離5�ターゲット�近付�"
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr "(7) �離7�ターゲット�近付�"
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr "(A) 攻撃範囲内�ターゲット�近付�"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr "(a) 弓師攻撃範囲"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?) ターゲット�近付�"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr "(D) デフォルトフォロー"
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr "(R) ��フォロー"
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr "(M) ミラーフォロー"
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr "(P) ペットフォロー"
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr "(?) �明�フォロー"
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) 攻撃"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) デフォルト攻撃"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr "(s) 盾��攻撃"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr "(S) 盾�り攻撃"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) 接近�攻撃"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) 接近�攻撃�拾�"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) 自動攻撃��"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) �範囲�拾� 1x1セル"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) デフォルト範囲�拾� 2x1セル"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 広範囲�拾� 2x3セル"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3セル�範囲�拾�"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) �離4�範囲�拾�"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) �離8�拾�"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr "(A) 最大範囲�拾�"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?) 拾�"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) 通常マップビュー"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr "(D) デ�ッグマップビュー"
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr "(u) ウルトラマップビュー"
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr "(U) ウルトラマップビュー2"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) 空マップビュー"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b) 白黒マップビュー"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) 魔法攻撃� #flarを使�"
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) 魔法攻撃� #chizaを使�"
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) 魔法攻撃� #ingravを使�"
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) 魔法攻撃� #frillyarを使�"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) 魔法攻撃� #upmarmuを使�"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) 魔法攻撃"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr "(a) 全��プレイヤーを攻撃"
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
-msgstr ""
+msgstr "(f) ��以外を攻撃"
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr "(b) 敵を攻撃"
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
-msgstr "(d) 他�プレイヤーを攻撃���"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr "(?) PvP攻撃"
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr "(D) デフォルト真似"
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr "(O) �装真似"
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr "(?) 真似を�る"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "アウェイ"
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) キーボード"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) アウェイ"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) アウェイ"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr "(G) ゲームカメラモード"
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr "(F) フリーカメラモード"
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr "ゲームモディファイア�有効������"
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr "ゲームモディファイア�無効������"
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
-msgstr "�明�ゲームモディファイアー"
+msgstr "�明�ゲームモディファイア"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "フォロー: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "フォローを止�る"
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr "真似: "
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "真似をや�る"
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr " �見�る"
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [オプション] [manaplus-ファイル]"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-ファイル] : manaplus�ファイル�XMLファイル�� (.manaplus)"
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr "                  �カスタムパラメーターを設定����"
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr "                  をmanaplusクライアント�設定����"
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "オプション:"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : 使用�るログファイル"
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : �ャットログ場所"
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : �ージョンを表示"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : ヘルプメニュー表示"
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : 使用�る設定ファイル"
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : �����ログイン�る"
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : ��パスワード�ログイン�る"
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : ��キャラクター�ログイン�る"
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : ログインサー�ー��IP"
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : ログインサー�ー�ート"
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : ��アップデートホストを利用�る"
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : デフォルト�使用�るキャラクターサー�ー�キャラク"
 "ターを�択�る"
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : アップデートをスキップ�る"
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : ゲームデータを読�込む場所"
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : ローカルデータディレクトリ�場所"
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : スクリーンショット��存場所"
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : セーフモード�ゲームを始�る"
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : ドライ�ー�自動コンフィグレーション�テストを始�る"
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --openglエラー      : OpenGLを今回��無効��る"
 
@@ -4461,7 +4521,7 @@ msgstr "売るアイテム��り��ん"
 
 #: src/net/ea/buysellhandler.cpp:171
 msgid "Thanks for buying."
-msgstr "�購入�り���������"
+msgstr "�り���������"
 
 #: src/net/ea/buysellhandler.cpp:179
 msgid "Unable to buy."
@@ -4469,27 +4529,27 @@ msgstr "購買����ん"
 
 #: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
-msgstr "Strength:"
+msgstr "攻撃力:"
 
 #: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
-msgstr "Agility:"
+msgstr "機��:"
 
 #: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
-msgstr "Vitality:"
+msgstr "防御力:"
 
 #: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
-msgstr "Intelligence:"
+msgstr "魔力:"
 
 #: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
-msgstr "Dexterity:"
+msgstr "命中率:"
 
 #: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
-msgstr "Luck:"
+msgstr "幸�:"
 
 #: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
@@ -4690,43 +4750,43 @@ msgstr "ギルド�ら追�出�れ���"
 msgid "%s has kicked from your guild."
 msgstr "%s�ギルド�ら追�出����"
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr "/invite パーティ�プレイヤーを招待�る"
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr "/leave パーティ�ら退会�る"
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick パーティ�らメン�ーを一時的�追�出�"
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr "/item パーティ内�アイテム共有モードを表示/変更�る"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp �パーティ内�経験シェアモードを表示/変更�る"
+msgstr "/exp �パーティ内�Expシェアモードを表示/変更�る"
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr "��コマンド�入力��プレイヤーを自分�パーティー�招待���"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr "��コマンド�パーティ�らプレイヤーを退会����"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr "コマンド: /item <�リシー>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr "��コマンド�アイテム共有モードを変更���"
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4734,69 +4794,69 @@ msgstr ""
 "＜�リシー＞ アイテム共有モードを有効�る���� \"1\", \"yes\", \"true\"�"
 "無効��る��\"0\", \"no\", \"false\"�入力��下��"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr "コマンド: /item"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr "��コマンド�アイテム共有モードを表示���"
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr "コマンド: /exp <�リシー>"
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
-msgstr "��コマンド�経験シェアモードを変更���"
+msgstr "��コマンド�Expシェアモードを変更���"
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"＜�リシー＞ 経験シェアモードを有効�る���� \"1\", \"yes\", \"true\"�無"
-"効��る��\"0\", \"no\", \"false\"�入力��下��"
+"＜�リシー＞ Expシェアモードを有効�る���� \"1\", \"yes\", \"true\"�無効"
+"��る��\"0\", \"no\", \"false\"�入力��下��"
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr "コマンド: /exp"
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
-msgstr "��コマンド�パーティメン�ー�経験シェアモードを表示���"
+msgstr "��コマンド�パーティメン�ー�Expシェアモードを表示���"
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "アイテム共有モード有効"
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "アイテム共有モード無効"
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "アイテム共有モード��能"
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr "アイテム共有モード�明"
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
-msgstr "経験シェアモード有効"
+msgstr "Expシェアモード有効"
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
-msgstr "経験シェアモード無効"
+msgstr "Expシェアモード無効"
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
-msgstr "経験シェアモード��能"
+msgstr "Expシェアモード��能"
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
-msgstr "経験シェアモード�明"
+msgstr "Expシェアモード�明"
 
 #: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
@@ -4871,185 +4931,185 @@ msgstr "ユーザ��既�使用�れ����"
 msgid "Username permanently erased."
 msgstr "ユーザー�ーム�永久�削除�れ���"
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "パーティ作�失敗"
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "パーティを作�����"
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s�パーティ��加����"
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s�既�パーティ�メン�ー��"
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s�招待を拒�����"
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s�パーティ�メン�ー��り���"
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "パーティ�満員�為%s��加����ん"
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ %s�ら�明�返答"
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "パーティ�ら退会����"
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s�パーティ�ら退会����"
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "�明�メン�ー�ら�応答: %s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "����死����"
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "残念��知ら��������様�キャラ�戦闘中��亡��り��り���"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "既�死ん��る模様��"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "死神�冷��手�魂��られ�����"
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "ゲームオー�ー"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "ゲームを続�る����コインを入れ�����"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 "����キャラ�本当�死ん�����ん。も��素敵�����������"
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "敵�武器を潰�予定����…失敗��"
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "�ん�り上手��������ー"
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "�体���物を確定��欲��？"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "悲���������跡形��も残�����ん"
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "全滅��ゃ��"
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "敵�ら「忘れ物���自分�頭を渡�れ���"
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "��や��ゃ���。死体をドブ����ら新���もら�る�も"
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "��死ん����ん。一時休憩中��"
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr "����無����"
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr "存在を消�去��"
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr "�����を引��り�神�元�旅立��"
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr "����死体����"
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr "命を失�天国�����"
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "�ん��も生気�満�����れ�既�葬られ�����"
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr "�����ん�り�今や歴�����"
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr "死ん�ゃ��"
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr "や��ゃ��"
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr "最後�呼����。死神�会��後�無�����"
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr "存在���プレイヤー��"
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr "���魂�北極��飛�れ�"
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "メッセージ"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "インベントリー�体���分以上�為�体力�回復����ん"
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr "インベントリー�体���分以下����為�体力�回復���"
 
@@ -5117,7 +5177,7 @@ msgstr "今��行動�����ん"
 
 #: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
-msgstr "�金�足り��ん"
+msgstr "GP�足り��ん"
 
 #: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
@@ -5137,7 +5197,7 @@ msgstr "アイテムを��������"
 
 #: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
-msgstr "�？何�れ？"
+msgstr "�ん？何�れ？"
 
 #: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
@@ -5184,7 +5244,7 @@ msgstr "������トレードキャンセルパケット"
 
 #: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "アイテム追加失敗。相手�インベントリー���オー�ー��"
+msgstr "アイテム追加失敗。相手�インベントリー���オー�ー��"
 
 #: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
@@ -5208,48 +5268,48 @@ msgstr "トレード完了"
 
 #: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
-msgstr "Strength"
+msgstr "攻撃力"
 
 #: src/net/manaserv/attributes.cpp:167
 #, c-format
 msgid "Strength %+.1f"
-msgstr "Strength %+.1f"
+msgstr "攻撃力 %+.1f"
 
 #: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
-msgstr "Agility"
+msgstr "機��"
 
 #: src/net/manaserv/attributes.cpp:180
 #, c-format
 msgid "Agility %+.1f"
-msgstr "Agility %+.1f"
+msgstr "機�� %+.1f"
 
 #: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
-msgstr "Dexterity"
+msgstr "命中率"
 
 #: src/net/manaserv/attributes.cpp:193
 #, c-format
 msgid "Dexterity %+.1f"
-msgstr "Dexterity %+.1f"
+msgstr "命中率 %+.1f"
 
 #: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
-msgstr "Vitality"
+msgstr "防御力"
 
 #: src/net/manaserv/attributes.cpp:206
 #, c-format
 msgid "Vitality %+.1f"
-msgstr "Vitality %+.1f"
+msgstr "防御力 %+.1f"
 
 #: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
-msgstr "Intelligence"
+msgstr "魔力"
 
 #: src/net/manaserv/attributes.cpp:219
 #, c-format
 msgid "Intelligence %+.1f"
-msgstr "Intelligence %+.1f"
+msgstr "魔力 %+.1f"
 
 #: src/net/manaserv/attributes.cpp:225
 msgid "Willpower"
@@ -5477,11 +5537,11 @@ msgstr "%s�招待を断り���"
 
 #: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
-msgstr "トレード申請を�付中"
+msgstr "トレードリクエストを�付中"
 
 #: src/net/manaserv/tradehandler.cpp:109
 msgid "Ignoring incoming trade requests."
-msgstr "トレード申請を無効中"
+msgstr "トレードリクエストを無視中"
 
 #: src/net/manaserv/tradehandler.cpp:146
 #, c-format
@@ -5498,7 +5558,7 @@ msgstr "追�出��功"
 
 #: src/net/tmwa/buysellhandler.cpp:133
 msgid "Thanks for selling."
-msgstr "販売�り���������。"
+msgstr "�り���������"
 
 #: src/net/tmwa/buysellhandler.cpp:137
 msgid "Unable to sell."
@@ -5515,32 +5575,32 @@ msgstr "トレード中�売買����ん"
 #: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
-msgstr "Strength %+d"
+msgstr "攻撃力 %+d"
 
 #: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
-msgstr "Agility %+d"
+msgstr "機�� %+d"
 
 #: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
-msgstr "Vitality %+d"
+msgstr "防御力 %+d"
 
 #: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
-msgstr "Intelligence %+d"
+msgstr "魔力 %+d"
 
 #: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
-msgstr "Dexterity %+d"
+msgstr "命中率 %+d"
 
 #: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
-msgstr "Luck %+d"
+msgstr "幸� %+d"
 
 #: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
@@ -5576,7 +5636,7 @@ msgstr "サー�ー�ら切断�れ���"
 
 #: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
-msgstr "Luck"
+msgstr "幸�"
 
 #: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
@@ -5633,24 +5693,24 @@ msgstr "ホスト�を解決����ん"
 msgid "Connection to server terminated. "
 msgstr "サー�ー��接続�切断�れ��� "
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s�パーティ�メン�ー���り��ん"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr "'...'を表示�る"
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr "��を点���る"
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr "フローティング'...'�出�"
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr "�出�"
 
diff --git a/po/ka.po b/po/ka.po
index 128734cdc..d708879ec 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,335 +18,359 @@ msgstr ""
 "Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "უცნ�ბი კ�მ�ნდ�."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -354,23 +379,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -378,79 +404,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr ""
 
@@ -486,7 +516,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr ""
@@ -513,81 +543,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr ""
 
@@ -595,120 +630,122 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -721,506 +758,551 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1233,345 +1315,382 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -1615,200 +1734,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:64
-msgid "Sfx volume"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:65
-msgid "Music volume"
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1856,40 +2014,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1912,360 +2070,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr ""
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2281,408 +2539,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2690,502 +2981,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3209,26 +3137,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3236,33 +3164,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3414,23 +3342,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3495,7 +3423,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3533,6 +3462,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3662,556 +3626,872 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4227,142 +4507,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4396,418 +4664,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4821,160 +5085,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -4983,7 +5247,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -4992,7 +5256,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5001,7 +5265,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5010,7 +5274,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5280,41 +5544,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5322,129 +5586,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/manaplus.pot b/po/manaplus.pot
index ea9e825db..d3b06b2bc 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,69 +18,73 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr ""
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -90,223 +94,223 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -315,11 +319,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
@@ -380,18 +384,18 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
@@ -429,7 +433,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
@@ -437,25 +441,25 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr ""
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
@@ -479,8 +483,8 @@ msgstr ""
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr ""
@@ -653,8 +657,8 @@ msgid "Enter password:"
 msgstr ""
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr ""
 
@@ -672,6 +676,7 @@ msgid "(empty)"
 msgstr ""
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
@@ -729,24 +734,23 @@ msgstr ""
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -770,7 +774,7 @@ msgid "Ignore"
 msgstr ""
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
@@ -845,62 +849,76 @@ msgstr ""
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -927,8 +945,8 @@ msgstr ""
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
@@ -1040,7 +1058,7 @@ msgstr ""
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
@@ -1099,91 +1117,91 @@ msgstr ""
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
@@ -1284,7 +1302,7 @@ msgid "Submit"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr ""
 
@@ -1394,7 +1412,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
@@ -1490,7 +1508,7 @@ msgstr ""
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr ""
 
@@ -1657,12 +1675,12 @@ msgstr ""
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
@@ -1740,25 +1758,25 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
@@ -1771,155 +1789,188 @@ msgstr ""
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:64
-msgid "Sfx volume"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:65
-msgid "Music volume"
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr ""
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr ""
 
@@ -1970,40 +2021,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -2026,456 +2077,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr ""
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2491,155 +2546,161 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:290
-msgid "Full screen"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:301
-msgid "Enable resize"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "No frame"
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:306
-msgid "FPS limit:"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
-msgid "Alt FPS limit: "
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:326
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
-msgid "None"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:494
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:500
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:511
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:512
-msgid "Restart needed for changes to take effect."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:524
-msgid "Changing to OpenGL"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:525
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:619
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:638
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
 #: src/gui/shopwindow.cpp:76
@@ -2723,7 +2784,7 @@ msgid "Lvl: %d (%+d)"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
@@ -2755,7 +2816,7 @@ msgstr ""
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
@@ -2927,139 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3287,7 +3348,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -3295,15 +3356,15 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3368,8 +3429,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3407,38 +3468,38 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
@@ -3578,865 +3639,865 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4673,107 +4734,107 @@ msgstr ""
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -4848,184 +4909,184 @@ msgstr ""
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -5609,24 +5670,24 @@ msgstr ""
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
diff --git a/po/nb.po b/po/nb.po
index 548cb83ad..271787bbf 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,340 +18,364 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr "Video"
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Feil"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Ukjent kommando"
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Kan ikke sende tomme meldinger!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Generelt"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Lagring av skjermbilde feilet!"
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Nettverksfeil"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Feil i lastingen av %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -359,23 +384,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Navn"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -383,79 +409,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Tilbakestill"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Kjøp"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Avslutt"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Maks"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Butikk"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Selg"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -491,7 +521,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Endre passord"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Passord:"
@@ -518,81 +548,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "Lag karakter:"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Navn:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Lag"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Mann"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Kvinne"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vennligst distribuer %d poeng"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Navnet ditt må minst være 4 bokstaver."
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vennligst fjern %d poeng"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "Bekreft karakter-sletting"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "Er du sikker på at du vil slette denne karakteren?"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "Konto- og karakter"
 
@@ -600,120 +635,122 @@ msgstr "Konto- og karakter"
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Avregistrer"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Slett"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -726,508 +763,553 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nei"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Kart"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Lukk"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Utstyr"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Hjelp"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Bruk"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Del opp"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "Vekt:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alt"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Venter på server"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Neste"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Bekreft"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Til:"
@@ -1240,345 +1322,382 @@ msgstr "Send"
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "Spillere"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -1622,200 +1741,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
-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:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Audio"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Lydeffekt-volum"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Musikk-volum"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Farger"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Slik ser fargen ut"
@@ -1863,40 +2021,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Bruk"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Trykk knappen for å starte kalibrasjon"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1919,360 +2077,460 @@ msgstr "Standard"
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstre"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "Spillere"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Synlige navn"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Nøytral"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Venn"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignorert"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Tillat handel"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2288,408 +2546,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Ingen tekst"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Tekst"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Bobler, ingen navn"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Bobler med navn"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "av"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "lav"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "høy"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "medium"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "maks"
-
-#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Fullskjerm"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
-msgstr "Partikkeleffekter"
-
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
-msgstr "som partikkel"
-
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Video"
-
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
-msgstr "GUI-gjennomsiktighet"
-
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr ""
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Endringer av OpenGL krever restart."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "GUI-gjennomsiktighet"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Ingen tekst"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Tekst"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Bobler, ingen navn"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Bobler med navn"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "av"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "lav"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "høy"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Partikkeleffekter"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "medium"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "maks"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Ferdigheter"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr "Opp"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Gruppe"
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har invitert deg til sin gruppe."
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Godta Gruppeinvitasjon"
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2697,502 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Penger: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3216,26 +3144,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3243,33 +3171,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Navn: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3421,23 +3349,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3502,11 +3430,10 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Hvis <brukernavn> inneholder mellomrom, skriv det mellom to anførselstegn "
-"(\")."
+msgstr "Hvis <brukernavn> inneholder mellomrom, skriv det mellom to anførselstegn (\")."
 
 #: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
@@ -3542,6 +3469,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3671,557 +3633,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4237,142 +4515,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4406,418 +4672,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4831,160 +5093,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -4993,7 +5255,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -5002,7 +5264,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5011,7 +5273,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5020,7 +5282,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5290,41 +5552,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5332,129 +5594,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/nl.po b/po/nl.po
index e6452e090..d3f967632 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,355 +2,380 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
-"Language-Team: Dutch (http://www.transifex.net/projects/p/manaplus/team/nl/)\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: Dutch (http://www.transifex.net/projects/p/manaplus/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr "Video"
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Netwerkfout"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Fout bij het laden van %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -359,23 +384,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Naam"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Aanvallen"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Spreken"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -383,79 +409,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Reset"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Kopen"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Prijs: %s / Totaal: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Maximum"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Winkel"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Verkopen"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -491,7 +521,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Wachtwoord:"
@@ -518,81 +548,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "Personage Aanmaken"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Naam:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Aanmaken"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Mannelijk"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Vrouwelijk"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan"
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "Bevestig het verwijderen van het personage"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "Account en personage beheer"
 
@@ -600,120 +635,122 @@ msgstr "Account en personage beheer"
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Registreren"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -726,508 +763,553 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nee"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Map"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Poort:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Uitrusting"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Afdoen"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Help"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
-msgstr "Inventaris"
-
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
-msgstr "Sloten:"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr "Inventaris"
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
+msgstr "Sloten:"
+
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Uitrusten"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Gebruiken"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Splitsen"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "Gewicht:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Opslaan"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Afhalen"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Neerleggen"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alle"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Selecteer het aantal exemplaren om te verhandelen"
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Selecteer het aantal exemplaren om neer te leggen"
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Selecteer hoeveelheid voorwerpen te bewaren."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Selecteer hoeveelheid voorwerpen terug te nemen."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Selecteer hoeveelheid voorwerpen om te splitsen."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Wachten op server"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Volgende"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Indienen"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Aan:"
@@ -1240,345 +1322,382 @@ msgstr "Verzenden"
 msgid "Failed to send as sender or letter invalid."
 msgstr "Kon niet zenden als zender, of de brief is ongeldig."
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Handel"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "Spelers"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Van server wisselen"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Van personage wisselen"
 
@@ -1622,200 +1741,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr "Poort:"
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Toevoegen"
 
-#: src/gui/serverdialog.cpp:393
-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/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Audio"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Volume van geluiden"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Muziek volume"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Dit is hoe de kleur eruit ziet"
@@ -1863,41 +2021,41 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Kalibreren"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Stoppen"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Maak rondjes met de stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1919,360 +2077,460 @@ msgstr "Standaard"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monsters"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "Spelers"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Zichtbare namen"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relatie"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutraal"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Vriend"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Handelen toestaan"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Lettergrootte"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -2288,408 +2546,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Geen tekst"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Tekst"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Bellen, geen namen"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Bellen met namen"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "uit"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "laag"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "hoog"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "gemiddeld"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
-msgstr "Deeltjes effecten"
-
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
-msgstr "Notificatie bij oprapen weergeven"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
-msgstr "in chat"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
-msgstr "als deeltje"
-
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Video"
-
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
-msgstr "Dekking van de GUI"
-
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr "Omgevingseffecten"
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:409
 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:602
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Dekking van de GUI"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Geen tekst"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Tekst"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Bellen, geen namen"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Bellen met namen"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "uit"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "laag"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "hoog"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Omgevingseffecten"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Deeltjes effecten"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "gemiddeld"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
-msgstr "Wijzigingen treden in werking bij het wisselen van map."
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr "Toevoegen"
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Vaardigheden"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guild"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Groep"
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Guild aanmaken"
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, 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/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, 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/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2697,502 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "Leven:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Ervaring:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "Magie:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3216,62 +3144,60 @@ msgstr "Goedgekeurd. Wachten..."
 msgid "Trade: You"
 msgstr "Handel: Jij"
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr "Je geeft:"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "Veranderen"
 
-#: src/gui/tradewindow.cpp:332
-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/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:375
 msgid "You don't have enough money."
 msgstr "Je hebt niet genoeg geld."
 
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in het venster."
+
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Naam: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Actualiseren..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Spelen"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1 Het updateproces is onvolledig."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Het is ten sterkste aanbevolen dat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -3423,23 +3349,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3493,9 +3419,7 @@ msgstr "Dit commando verlaat het huidige kanaal."
 
 #: src/gui/widgets/channeltab.cpp:78
 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."
+msgstr "Als je de laatste persoon in het kanaal bent, zal het kanaal worden verwijderd."
 
 #: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
@@ -3506,17 +3430,14 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 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 "
-"(\")."
+msgstr "Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens (\")."
 
 #: src/gui/widgets/channeltab.cpp:87
 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."
+msgstr "Kanaalbeheerders kunnen andere gebruikers uit het kanaal verwijderen en andere gebruikers kanaalbeheerders maken."
 
 #: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
@@ -3548,6 +3469,41 @@ msgstr "Globale aankondiging van %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3677,557 +3633,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Omhoog"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Omlaag"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Naar links"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Naar rechts"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Viseren en Aanvallen"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Smilie"
-
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Aanval stoppen"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "NPC viseren"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Speler viseren"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Oprapen"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Vensters verbergen"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Zitten"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr "OK selecteren"
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Snelkopeling naar voorwerp %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Help venster"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Statusvenster"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Uitrustingsvenster"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Vaardigheidsvenster"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Minimapvenster"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Gespreksvenster"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Voorwerpsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Instellingenvenster"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Debugvenster"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Emoticonsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr "Smilie"
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emoticon snelkoppeling %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Chat omhoogscrollen"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Chat omlaagscrollen"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Vorige chattab"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "OK selecteren"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ingave 1 negeren"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Opties:"
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4243,142 +4515,130 @@ msgstr "Bedankt voor de aankopen."
 msgid "Unable to buy."
 msgstr "Kan niets kopen."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Info"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4412,425 +4672,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Je bent dood."
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 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."
+msgstr "We betreuren het om je te melden dat jouw personage is gestorven in een gevecht."
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Je bent niet langer levend."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 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/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 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."
+msgstr "Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is naar een beter plaats gegaan."
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 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."
+msgstr "Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel te slaan is mislukt."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Dit verliep niet zoals gepland."
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..."
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Verslagen"
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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."
+msgstr "Je hebt het weer verknald, dump jouw lichaam  en ga er een nieuw halen."
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4844,160 +5093,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s wil met jou handelen, aanvaard je dit?"
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "Handel geannuleerd."
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "Handel voltooid."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Kracht"
 
@@ -5006,7 +5255,7 @@ msgstr "Kracht"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Behendigheid"
 
@@ -5015,7 +5264,7 @@ msgstr "Behendigheid"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Vaardigheid"
 
@@ -5024,7 +5273,7 @@ msgstr "Vaardigheid"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Vitaliteit"
 
@@ -5033,7 +5282,7 @@ msgstr "Vitaliteit"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Intelligentie"
 
@@ -5303,41 +5552,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr "Kracht %+d"
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr "Behandigheid %+d"
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitaliteit %+d"
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligentie %+d"
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Vaardigheid %+d"
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr "Geluk %+d"
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5345,129 +5594,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr "De verbinding met de server werd verbroken!"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Geluk"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s is niet in jouw groep!"
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "naamloos"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Aanval %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Verdediging %+d"
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "Leven %+d"
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "Magie %+d"
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
-
-
diff --git a/po/nl_BE.po b/po/nl_BE.po
index b45b9432f..742f07f62 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,80 +9,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-05 23:09+0000\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/"
-"team/nl_BE/)\n"
+"language/nl_BE/)\n"
 "Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "ontwijkt"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr ""
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Video"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr ""
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -92,63 +96,63 @@ msgstr "Wijzigen spelservers"
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Onbekend commando."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Kan geen lege berichten sturen!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -157,160 +161,160 @@ msgstr ""
 "Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
 "bestaat, of het is jezelf."
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Groepsnaam ontbreekt."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "Guild-naam ontbreekt."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren"
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat"
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Ga nu terug naar chat."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "vriend"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "genegeerd"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "neutraal"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "Speler succesvol verwijderd!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weken"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagen"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uren"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d seconden"
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "Aangemaakt:"
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "Verwijdered:"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -320,11 +324,11 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Algemeen"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "Debug"
 
@@ -385,18 +389,18 @@ msgstr ""
 msgid "Bot Checker"
 msgstr "Bot Controleerder"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Naam"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Aanvallen"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Spreken"
 
@@ -434,7 +438,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -442,25 +446,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Afsluiten"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Maximum"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Winkel"
 
@@ -484,8 +488,8 @@ msgstr "Verkopen"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Annuleren"
@@ -658,8 +662,8 @@ msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -677,6 +681,7 @@ msgid "(empty)"
 msgstr "(leeg)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "standaard"
 
@@ -734,24 +739,23 @@ msgstr "regenboog 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
@@ -775,7 +779,7 @@ msgid "Ignore"
 msgstr "Negeer"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Map"
 
@@ -850,62 +854,76 @@ msgstr ""
 msgid "Particle count: %d"
 msgstr "Deeltjes-aantal: %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Doel:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "Doel identificatie:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
-msgstr "Doel niveau:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
-msgstr "Doel Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
-msgstr "Doel Gilde:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "Aanvalsvertraging:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Doel niveau:"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Doel Party:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Doel Gilde:"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Invoer: %d bytes/sec"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Uitvoer: %d bytes/sec"
@@ -932,8 +950,8 @@ msgstr "Volgend >"
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -1045,7 +1063,7 @@ msgstr "Gewicht:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Opslaan"
 
@@ -1104,91 +1122,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Gewicht: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Doden statistieken"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "Herzet statistieken"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "Herzet timer"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Tijd tot volgend niveau: %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
@@ -1289,7 +1307,7 @@ msgid "Submit"
 msgstr "Indienen"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
@@ -1399,7 +1417,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -1495,7 +1513,7 @@ msgstr ""
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Spelers"
 
@@ -1662,12 +1680,12 @@ msgstr "Toon"
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(standaard)"
@@ -1745,25 +1763,25 @@ msgstr "Verbinden"
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Wijzig"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
@@ -1776,157 +1794,188 @@ msgstr "vereist een nieuwere versie"
 msgid "requires v%s"
 msgstr "vereist v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Audio"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Zet audio aan"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "Zet muziek aan"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "Zet spel sfx aan"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "Zet gui sfx aan"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "Zet muziek aan"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "Zet mumble voice chat aan"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "Download muziek"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Audio"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Volume van geluiden"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Muziek volume"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Opmerking"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
-"U zal waarschijnlijk uw client moeten herstarten als u nieuwe muziek wilt "
-"downloaden"
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Geluidsengine"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "Andere"
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "Zet mumble voice chat aan"
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "Download muziek"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Verwijder kleuren van ontvangen chat berichten"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Toon chat kleurenlijst"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "Commando's"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "Limieten"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Limiteer max karakters in chat lijn"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Limiteer max lijnen in chat"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "Logs"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "Zet chat log aan"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Toon chat geschiedenis"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "Berichten"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Verberg verkoop boodschappen"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Toon server berichten in de debug tab"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "Zet handle tab aan"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "Tijd"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "Gebruik lokale tijd"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "Andere"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr ""
 
@@ -1977,40 +2026,40 @@ msgstr "Blauw:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Druk op de knop om het kalibreren te starten"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Kalibreren"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Joystick activeren"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Stoppen"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -2033,456 +2082,460 @@ msgstr "Standaard"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflict(en) tussen toetsen gevonden."
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monsters"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Toon aangebrachte schade aan monsters"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "Automatisch enkel bereikbare monsters viseren"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Markeer het aanvalsbereik van de monsters"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "Toon hp statusbalk van monsters"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Markeer vloer voorwerpen"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Markeer het aanvalsbereik van de speler"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr "Toon uitgebreide minimaps"
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "Teken de weg"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr ""
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "Bewegen"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "Aanvallen tijdens verplaatsen"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "Speler"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Toon hp statusbalk van jezelf"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "Zet snelle statistieken aan"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Accepteer koop/verkoop aanvragen"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "shop modus aanzetten"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr "Aanval gecontroleerd door server aanzetten"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Bot controle aanzetten"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "Zet debug log aan"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Toon achtergrond"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "Hw acceleratie"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Toon geslacht"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Toon niveau"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Toon eigen naam"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "Viseer dode spelers"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Zichtbare namen"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relatie"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutraal"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Vriend"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Geen rekening mee houden"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Genegeerd"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Gewist"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Handelen toestaan"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Fluisteren toestaan"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Oud"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "Relaties"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Tijdens negeren:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Heel klein (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Klein (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Middelmatig (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Groot (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Heel groot (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Extreem groot (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Thema"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "Standaard Lettertype"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Vet lettertype"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "Help lettertype"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Lettergrootte"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Thema is gewijzigd"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -2498,162 +2551,168 @@ msgstr "Snelle OpenGL"
 msgid "Safe OpenGL"
 msgstr "Veilige OpenGL"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Geen tekst"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Tekst"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Bellen, geen namen"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Bellen met namen"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "uit"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "laag"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "hoog"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "gemiddeld"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Volledig scherm"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Deeltjes effecten"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Notificatie bij oprapen weergeven"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "in chat"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "als deeltje"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "FPS limiet:"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "Alt FPS limiet: "
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "Dekking van de GUI"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "Omgevingseffecten"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "Geen"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus "
 "faalde ook!"
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude "
 "modus faalde ook!"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten"
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 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:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:                "
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
 "resolutie"
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Dekking van de GUI"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Geen tekst"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Tekst"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Bellen, geen namen"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Bellen met namen"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "Wijzigingen treden in werking bij het wisselen van map."
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "uit"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "laag"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "hoog"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Omgevingseffecten"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Deeltjes effecten"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "gemiddeld"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2736,7 +2795,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "Niv: %d (%+d)"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guild"
 
@@ -2768,7 +2827,7 @@ msgstr "Verlaten Guild?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bent u zeker dat u guild %s wilt verlaten?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Groep"
 
@@ -2940,139 +2999,139 @@ msgstr "Kies uw groepsnaam."
 msgid "Specials"
 msgstr "Specialen"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "Leven:"
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Ervaring:"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "Magie:"
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Niveau: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Geen Doel"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "Doel Toestaan"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "Heeft Doel Nodig"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Algemene Magie"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Levensmagie"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Oorlogsmagie"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Wijzigingsmagie"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Natuursmagie"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "magie"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "ander"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "Symbool:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Commando:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Doel Type:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "Icoon:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Magie niveau:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "Magie School:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "School niveau:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Bewaren"
 
@@ -3302,7 +3361,7 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
@@ -3310,15 +3369,15 @@ msgstr "Wie Is Online - Bijwerken"
 msgid "Update"
 msgstr "Bijwerken"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -3385,8 +3444,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 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 "
@@ -3428,38 +3487,38 @@ msgstr "Globale aankondiging van %s:"
 msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr "Commando: /invite <nick>"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr "Commando: /leave"
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr "/help > Geeft deze help weer."
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
@@ -3602,865 +3661,865 @@ msgstr ""
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Omhoog"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Omlaag"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Naar links"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Naar rechts"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Viseren en Aanvallen"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "Beweeg tot aan Doel"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "Wijzig Bewegen tot aan Doel type"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Aanval stoppen"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "Dichtsbijzijnde viseren"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "NPC viseren"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Speler viseren"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Oprapen"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Vensters verbergen"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Zitten"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "Wijzig Map Tonen Modus"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "OK selecteren"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr "Voorwerpsnelkoppelingstoets"
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Snelkoppeling naar voorwerp %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Help venster"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Statusvenster"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Uitrustingsvenster"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Vaardigheidsvenster"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Minimapvenster"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Gespreksvenster"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Voorwerpsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Instellingenvenster"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Debugvenster"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "Sociaal Venster"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Emoticonsnelkoppelingsvenster"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "Kleren Venster"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr "Snel neerleggingsvenster"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr "Commando Venster"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr "Bot Controle Venster"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "Wie Is Online Venster"
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "Weet u Venster"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Smilie"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Emoticon snelkoppeling %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "Draag Kledij"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr "Kopiëer Kledij"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Chat omhoogscrollen"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Chat omlaagscrollen"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Vorige chattab"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Volgende chattab"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ingave 1 negeren"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ingave 2 negeren"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Snel N Voorwerpen van slot 0 neerleggen"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr "Snel N Voorwerpen Neerleggen"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr "Wissel Snel Neerleggingsteller"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "Snel jezelf of iemand anders genezen"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr "Gebruik #itenplz spreuk"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "Gebruik magie aanval"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "Aan / Uit audio"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "U raapte op %d [@@%d|%s@@]."
 msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) standaard bewegingen"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr "(I) geïnverteerde bewegingen"
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegingen met vreemde bewegingen"
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normaal + raar"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr "(a) manuele vreemde beweging"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr "(?) vreemde beweging"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr "(0) standaard bewegingen tot aan doel"
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bewegen tot aan doel in bereik 1"
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegen tot aan doel in bereik 2"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegen tot aan doel in bereik 3"
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegen tot aan doel in bereik 5"
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegen tot aan doel in bereik 7"
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?) beweeg tot aan doel"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr "(D) standaard volgen"
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr "(R) relatief volgen"
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeld volgen"
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr "(P) huisdier volgen"
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr "(?) onbekend volgen"
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) aanval"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) standaard aanval"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr "(s) wissel aanval zonder schild"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr "(S) wissel aanval met schild"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) ga en val aan"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) ga, val aan, raap op"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) zonder auto aanval"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) klein raap op 1x1 velden"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standaard raap op 2x1 velden"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) vooruit raap op 2x3 velden"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) raap op 3x3 velden"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) go en raap op met bereik 4"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ga en raap op met bereik 8"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ga en raap op zonder bereiklimiet"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?) raap op"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) normale map tonen"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr "(D) debug map tonen"
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr "(u) ultra map tonen"
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra map tonen 2"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) lege map tonen"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b) zwart & witte map tonen"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gebruik #flar voor magie aanval"
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gebruik #chiza voor magie aanval"
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) gebruik #ingrav voor magie aanval"
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gebruik #frillyar voor magie aanval"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gebruik #upmarmu voor magie aanval"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) magie aanval"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr "(D) standaard imitatie"
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr "(O) kleren imitatie"
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr "(?) imitatie"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "Weg"
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) op toetsenbord"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) weg"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) weg"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr "(G) spel camera modus"
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "Volg: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Opties:"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Log bestand te gebruiken"
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Chat log bestand te gebruiken"
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Toon de versie"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Toon deze help"
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Configuratie map te gebruiken"
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Login met deze gebruikersnaam"
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Loging met dit wachtwoord"
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Login met dit karakter"
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Login servernaam of IP"
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Login serverpoort"
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Updateserver te gebruiken"
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Kies standaard karakterserver en karakter"
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : update downloads overslaan"
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Map om spelgegevens te laden"
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Map te gebruiken als lokale data map"
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Start spel in veilige modus"
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Zet OpenGL af voor deze sessie"
 
@@ -4699,43 +4758,43 @@ msgstr ""
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Nodig een speler uit voor jouw groep"
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Verlaat de groep waarin je je bevindt"
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Verwijder iemand vanuit de groep waarin je bent"
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Geeft weer/wijzigt de opties voor voorwerpdeling"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Geeft weer/wijzigt de ervaringsdelingsopties"
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr "Dit commando nodigt <nick> uit om een groep te vormen met jou."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr "Dit commando zorgt ervoor dat de speler de groep verlaat."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr "Commando: /item <beleid>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr "Dit commando wijzigt het voorwerpdelingsbeleid van de groep."
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4744,24 +4803,24 @@ msgstr ""
 "\"1\", \"yes\", \"true\". Of om voorwerpdeling uit te schakelen: \"0\", \"no"
 "\", \"false\"."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr "Commando: /item"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Dit commando geeft het huidige voorwerpdelingsbeleid van de groep weer."
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr "Commando: /exp <beleid>"
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr "Dit commando wijzigt het ervaringsdelingsbeleid van de groep."
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -4770,44 +4829,44 @@ msgstr ""
 "\"1\", \"true\", \"yes\". Of om ervaringsdeling uit te schakelen: \"0\", "
 "\"false\", \"no\"."
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr "Commando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Dit commando geeft het huidige ervaringsdelingbeleid van de groep weer."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "Voorwerpdeling ingeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr "Voorwerpdeling onbekend."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -4884,85 +4943,85 @@ msgstr "Deze gebruikersnaam is al genomen."
 msgid "Username permanently erased."
 msgstr "Gebruikersnaam is compleet verwijderd"
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Kan geen groep aanmaken."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "Groep succesvol aangemaakt."
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s is al een lid van een groep."
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s wees jouw uitnodiging af."
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s is nu een lid van jouw groep."
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "Je hebt de groep verlaten."
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s heeft jouw groep verlaten."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Een onbekend lid probeerde te zeggen: %s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Je bent dood."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 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/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Je bent niet langer levend."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 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/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Game Over!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "Werp een muntstuk in om verder te spelen."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4970,7 +5029,7 @@ msgstr ""
 "Neen, kinderen. Jouw personage is niet echt gestorven. Het... euhm... is "
 "naar een beter plaats gegaan."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
@@ -4978,99 +5037,99 @@ msgstr ""
 "Jouw plan om vijandelijke wapens te vernietignen door ermee tegen jouw keel "
 "te slaan is mislukt."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Dit verliep niet zoals gepland."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Wil je dat jouw bezittingen geïdentificeerd worden?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Spijtig genoeg, was er geen spoor van jou gevonden..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Verslagen"
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Het ziet ernaar uit dat je je pijp aan Maarten mag geven."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "Je bent nog niet dood. Je bent maar aan het rusten."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr "Je bent niet langer."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr "Je hebt opgehouden te zijn."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr "Je bent verlopen en gaat een bezoekje maken bij jouw schepper."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr "Je bent stokstijf."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr "Beroofd van het leven, rust je in vrede."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr "Jouw metabolische processen behoren nu tot het verleden."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr "Je bent een ex-speler."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "Bericht"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 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/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -5656,24 +5715,24 @@ msgstr "Niet mogelijk te resolven van host \""
 msgid "Connection to server terminated. "
 msgstr "Verbinding met server beëindigd. "
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s is niet in jouw groep!"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr "Say '...'"
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr "Blink naam"
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr "Zwevende '...' bel"
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr "Zwevende bel"
 
diff --git a/po/pl.po b/po/pl.po
index 3c40b1082..d60899cc0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-05 23:09+0000\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/"
+"Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/language/"
 "pl/)\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -21,69 +21,73 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2)\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr "Człowiek"
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "Unik!"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Wydajność programu"
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Obraz"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr "Skórki"
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "�ączenie z serwerem"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Logowanie"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "�ączenie się z serwerem gry"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -93,63 +97,63 @@ msgstr "Zmiana serwera"
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy serwer aktualizacji: %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "BÅ‚Ä…d podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Nieznane polecenie."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Nie można wysłać pustych szeptów!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -157,105 +161,105 @@ msgid ""
 msgstr ""
 "Nie można utworzyć zakładki szeptu dla \"%s\"! Już istnieje, albo to Ty."
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Prośba o dołączenie do kanału %s."
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Brakuje nazwy grupy."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "Brak nazwy gildii."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Proszę wpisać prawidłową nazwę."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "znajomy"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "lekceważony"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "neutralny"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "Gracz jest już %s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Gracz jest teraz %s!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Gracz nie może być %s!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "Gracz nie był ignorowany!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "Gracz już nie jest ignorowany!"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "Gracz nie może być odignorowany!"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr "dodany/a do czarnej listy"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr "wróg"
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "Gracz został usunięty!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "Gracz usunięty z powodzeniem!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "Gracz nie mógł zostać usunięty!"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -263,7 +267,7 @@ msgstr[0] "%d tydzień"
 msgstr[1] "%d tygodni/e"
 msgstr[2] "%d tygodni/e"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -271,7 +275,7 @@ msgstr[0] "%d dzień"
 msgstr[1] "%d dni"
 msgstr[2] "%d dni"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -279,7 +283,7 @@ msgstr[0] "%d godzina"
 msgstr[1] "%d godzin/y"
 msgstr[2] "%d godzin/y"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -287,7 +291,7 @@ msgstr[0] "%d minuta"
 msgstr[1] "%d minut/y"
 msgstr[2] "%d minut/y"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -295,27 +299,27 @@ msgstr[0] "%d sekunda"
 msgstr[1] "%d sekund/y"
 msgstr[2] "%d sekund/y"
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "rozmiar cache czcionki"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr "Rozmiar cache:"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "Stworzono:"
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "Usunięto:"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
@@ -324,11 +328,11 @@ msgstr "Osierocone obrazy źródłowe:"
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcjami dla /%s sÄ… \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Ogólny"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "Debug"
 
@@ -389,18 +393,18 @@ msgstr "Komentarz: %s"
 msgid "Bot Checker"
 msgstr "Wykrywacz botów"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
-msgstr "Nazwa"
+msgstr "ImiÄ™"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atak"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Rozmowa"
 
@@ -438,7 +442,7 @@ msgstr "Ilość:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -446,25 +450,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Wyjdź"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Maks."
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Sklep"
 
@@ -488,8 +492,8 @@ msgstr "Sprzedaj"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Anuluj"
@@ -555,12 +559,12 @@ msgstr "Potwierdzenie hasła nie zgadza się."
 
 #: src/gui/charcreatedialog.cpp:70
 msgid "New Character"
-msgstr ""
+msgstr "Nowa postać"
 
 #: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
 #: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
-msgstr "ImiÄ™:"
+msgstr "Nazwa:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
@@ -587,7 +591,7 @@ msgstr "Fryzura:"
 
 #: src/gui/charcreatedialog.cpp:112
 msgid "^"
-msgstr ""
+msgstr "^"
 
 #: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
@@ -662,8 +666,8 @@ msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Usuń"
 
@@ -681,6 +685,7 @@ msgid "(empty)"
 msgstr "(puste)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "domyślnie"
 
@@ -738,24 +743,23 @@ msgstr "tęczowy 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Czat"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%s obecny/a. %d graczy online."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
@@ -779,7 +783,7 @@ msgid "Ignore"
 msgstr "Ignoruj"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Mapa"
 
@@ -854,62 +858,76 @@ msgstr "Licznik tekstur:"
 msgid "Particle count: %d"
 msgstr "Licznik czÄ…steczek: %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Cel:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "ID celu:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr "Poziom celu:"
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
-msgstr "Grupa celu:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr "Rasa celu:"
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr "Drużyna celu:"
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr "Gildia celu:"
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "Opóźnienie ataku:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr "Najsłabsze uderzenie:"
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr "Najmocniejsze uderzenie:"
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr "Uderzenie krytyczne:"
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Poziom celu:"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Grupa celu:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Gildia celu:"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Wejście: %d bajtów"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Wyjście: %d bajtów"
@@ -936,19 +954,19 @@ msgstr "Dalej>"
 msgid "Auto open this window"
 msgstr "Otwieraj to okno automatycznie"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Ok"
 
 #: src/gui/editserverdialog.cpp:54
 msgid "Edit Server"
-msgstr ""
+msgstr "Edytuj serwer"
 
 #: src/gui/editserverdialog.cpp:62
 msgid "Address:"
-msgstr ""
+msgstr "Adres:"
 
 #: src/gui/editserverdialog.cpp:63
 msgid "Port:"
@@ -960,11 +978,11 @@ msgstr "Typ serwera:"
 
 #: src/gui/editserverdialog.cpp:65
 msgid "Description:"
-msgstr ""
+msgstr "Opis:"
 
 #: src/gui/editserverdialog.cpp:175
 msgid "Please at least type both the address and the port of the server."
-msgstr ""
+msgstr "Wymagany zarówno adres jak i port serwera."
 
 #: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
@@ -1049,7 +1067,7 @@ msgstr "Waga:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Przechowaj"
 
@@ -1108,55 +1126,55 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Waga: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Statystyki ataku:"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "Zresetuj statystyki"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "Zresetuj zegar"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Poziom: %d w %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d Zostało: %d"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, avg mob na 1%%: %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Moby: %s, całk. exp: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Avg Exp: %s, ilość mobów na nast. poziom: %s"
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mob/Min: %s, Exp/Min: %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1164,7 +1182,7 @@ msgstr[0] "Szybkość exp na %d min: %s"
 msgstr[1] "Szybkość exp na %d min: %s"
 msgstr[2] "Szybkość exp na %d min: %s"
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1172,29 +1190,29 @@ msgstr[0] "Czas do nast. poziomu z %d min: %s"
 msgstr[1] "Czas do nast. poziomu z %d min: %s"
 msgstr[2] "Czas do nast. poziomu z %d min: %s"
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "Ostatni exp:"
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr "Następny spawn Jack-O:"
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Czas do nast. poziomu: %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr "Jack-O spawnuje siÄ™"
 
@@ -1295,7 +1313,7 @@ msgid "Submit"
 msgstr "Zatwierdź"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
@@ -1405,7 +1423,7 @@ msgstr "Odignoruj"
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -1501,7 +1519,7 @@ msgstr "Dodaj do listy ignorowanych"
 msgid "Add name to chat"
 msgstr "Wpisz do czatu"
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Gracze"
 
@@ -1668,12 +1686,12 @@ msgstr "Pokaż"
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(domyślne)"
@@ -1751,25 +1769,25 @@ msgstr "Połącz"
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Edycja"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Ściąganie listy serwerów... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "Czekanie na serwer..."
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Przygotowanie ściągania"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "Błąd przy uzyskiwaniu listy serwerów!"
 
@@ -1782,155 +1800,188 @@ msgstr "wymaga nowszej wersji"
 msgid "requires v%s"
 msgstr "wymaga v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Dźwięk"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Włącz dźwięk"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "WÅ‚Ä…cz muzykÄ™"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "WÅ‚Ä…cz efekty gry"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "WÅ‚Ä…cz efekty GUI"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "WÅ‚Ä…cz muzykÄ™"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "WÅ‚Ä…cz integracjÄ™ z Mumble"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "ÅšciÄ…gnij muzykÄ™"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Dźwięk"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Głośność efektów dźwiękowych"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Głośność muzyki"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Powiadomienie"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
-msgstr "Musisz zrestartować program aby ściągnąć nową muzykę."
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Silnik dźwięku"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "Inne"
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "WÅ‚Ä…cz integracjÄ™ z Mumble"
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "ÅšciÄ…gnij muzykÄ™"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Usuń kolory z odbieranych wiadomości"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Pokazuj listę kolorów czatu"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "Polecenia"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Pozwól poleceniom magicznym i GM pojawiać się we wszystkich zakładkach"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "Limity"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Limit znaków w wierszu czatu"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Limit wierszy w czacie"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "Logi"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "WÅ‚Ä…cz logowanie czatu"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Pokazuj historiÄ™ czatu"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "Wiadomości"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Ukryj wiadomości od sklepów"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "Zakładki"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Umieść wszystkie szepty w zakładkach"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "Loguj powiadomienia o magii w zakładce Debug"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Pokazuj wiadomości serwera w zakładce Debug"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "WÅ‚Ä…cz tab handlowy"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "Włącz zakładkę bitewną"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "Pokazuj wydarzenia bitewne"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr "Jeśli potrzeba, zmień rozmiar zakładek czatu"
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "Czas"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "Użyj lokalnego czasu"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "Inne"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr "Podświetlaj słowa (oddzielaj przecinkiem)"
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr "Pokazuj wiadomości MVP"
 
@@ -1981,41 +2032,41 @@ msgstr "Niebieski:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Naciśnij przycisk aby rozpocząć kalibrację"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Kalibruj"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "WÅ‚Ä…cz joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr "Używaj joysticka jeśli okno klienta nieaktywne"
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
-msgstr "Obracaj uchwytem i nie naciskaj guzików."
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr "Obracaj drążkiem i nie naciskaj przycisków"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2037,456 +2088,460 @@ msgstr "Domyślne"
 msgid "Key Conflict(s) Detected."
 msgstr "Wykryto konflikt klawiszy."
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "Różne"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Potwory"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Pokaż zadane potworom obrażenia"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "Automatycznie namierzaj tylko dosięgalne potwory"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Podświetl zasięg ataku potworów"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "Pokazuj pasek życia potworów"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "Przewijaj namierzanie potworów"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr "WÅ‚Ä…cz efekty portali"
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "Podświetl portale na mapie"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Podświetl przedmioty na podłodze"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Podświetl zasięg ataku graczy"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr "Pokaż rozszerzone minimapy"
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "Rysuj ścieżkę"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr "Rysuj klawisze skrótu na mapie"
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr "WÅ‚Ä…cz leniwe przewijanie"
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr "Leniwość przewijania"
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr "Promień przewijania"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "Poruszanie siÄ™"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "Koryguj pozycjÄ™ automatycznie"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "Atakuj podczas poruszania siÄ™"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "Synchronizuj ruchy graczy"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "Szalone ruchy: program A"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "Gracze"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Pokazuj własny pasek życia"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "WÅ‚Ä…cz szybkie statystyki"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "Przewijaj namierzanie graczy"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "Pokazuj wiadomości o punktach doświadczenia umiejętności"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "Pokazuj wyskakujÄ…ce powiadomienia graczy"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr "Wiadomość AFK"
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "Pokazuj poziom umiejętności"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr "Filtruj ataki"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr "Włącz protokół reklamowy"
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Akceptuj prośby o handel"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "WÅ‚Ä…cz tryb sklepu"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "Loguj dialogi NPC"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr "Integracja z botami"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr "WÅ‚Ä…cz integracjÄ™ z AuctionBotem"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Włącz integrację z guild-botem i wyłącz natywną obsługę gildii"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr "WÅ‚Ä…cz atak ze strony serwera"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Włącz wykrywacza botów"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "WÅ‚Ä…cz ochronÄ™ przeciw zbugowanym serwerom"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "WÅ‚Ä…cz logowanie Debug"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "Tryb niskiego transferu"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr "Chowaj obrazek tarczy"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Pokazuj tło"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Lepsza wydajność programu (włącz by poprawić wydajność)"
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr "Automatycznie dopasuj ustawienia jakości"
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "Przyspieszenie Hw"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr "Włącz cache przezroczystości (Software, może zużyć dużo pamięci)"
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr "WÅ‚Ä…cz redukowanie map (Software)"
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr "Lepsza jakość (wyłącz dla lepszej wydajności)"
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Napraw kanał alfa (Software, może bardzo spowolniać)"
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr "Pokaż przezroczystość istot"
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr "Włącz reorganizację obrazków"
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Zmniejszenie zużycia pamięci"
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr "Wyłącz zaawansowany cache istot (Software)"
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr "Wyłącz cache istot (Software)"
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Pokazuj płeć"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Pokazuj poziom"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Pokazuj własne imię"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr "WÅ‚Ä…cz zaawansowane namierzanie myszkÄ…"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "Namierzaj martwych graczy"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Widoczne imiona"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr "Bezpieczny handel"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr "Niebezpieczne znaki w imionach"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr "Pokaż statusy"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr "Pokaż adres IP na zrzutach ekranu"
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr "Pozwól na leczenie siebie kliknięciem"
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr "Grupuj przyjaciół w oknie obecnych online"
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relacja"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutralny"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Przyjaciel"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Lekceważony"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignorowany"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Skasowany"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr "Dodany/a do czarnej listy"
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr "Wróg"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Zezwól na handel"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Zezwól na szepty"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Resetuj"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "Relacje"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Gdy ignorowany:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Bardzo mała (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Mała (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Åšrednia (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Duża (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Bardzo duża (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Ogromna (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr "Chinese (China)"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr "Czech"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr "English"
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr "Finnish"
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr "French"
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr "German"
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr "Indonesian"
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr "Polish"
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr "Japanese"
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Dutch (Belgium/Flemish)"
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr "Portuguese (Brazilian)"
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr "Russian"
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr "Spanish (Castilian)"
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Skórka"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "Skórka GUI"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr "Język"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "Główna czcionka"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Pogrubiona czcionka"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "Czcionka efektów"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "Czcionka pomocy"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr "Bezpieczna czcionka"
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr "Japońska czcionka"
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Rozmiar czcionki"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Skórka zmieniona"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
 
@@ -2502,161 +2557,167 @@ msgstr "Szybki OpenGL"
 msgid "Safe OpenGL"
 msgstr "Bezpieczny OpenGL"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Brak tekstu"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Tekst"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "BÄ…belki, brak imion"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "BÄ…belki z imionami"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "wyłączone"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "niskie"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "wysokie"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "średnie"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "najlepsze"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Pełny ekran"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "WÅ‚asny kursor"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Efekty czÄ…steczkowe"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Pokaż powiadomienie o podniesieniu"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "w czacie"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "jako czÄ…steczkÄ™"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
-msgstr ""
+msgstr "WÅ‚Ä…cz zmianÄ™ rozmiaru"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
-msgstr ""
+msgstr "Bez ramki"
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "Limit FPS:"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "Alternatywny limit FPS:"
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr "Tekst nad głową"
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "Przezroczystość GUI"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "Efekty otoczenia"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "Detale czÄ…steczkowe"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "Brak"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Nie udało się zmienić na tryb pełnoekranowy ani przywrócić do poprzedniego "
 "stanu!"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Zmiana na tryb pełnoekranowy"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Zmiana na OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Własna rozdzielczość (np. 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "Wpisz nową rozdzielczość:"
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "Rozdzielczość zmieniona"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Niektóre okna mogą być przesunięte aby dopasować się do niższej "
 "rozdzielczości."
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "Ustawienia efektów cząsteczkowych zmienione."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr "Obraz"
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr "Pokazuj wiadomości o podnoszeniu w czacie"
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr "Pokazuj wiadomości o podnoszeniu jako cząsteczki"
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr "Przechwytuj sygnały z myszki i klawiatury"
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Przezroczystość GUI"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Brak tekstu"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Tekst"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "BÄ…belki, brak imion"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "BÄ…belki z imionami"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Tekst nad głową"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "wyłączone"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "niskie"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "wysokie"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Efekty otoczenia"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Efekty czÄ…steczkowe"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "średnie"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "najlepsze"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "Detale czÄ…steczkowe"
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr "Gamma"
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr "włączone"
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "Efekty nastÄ…piÄ… po zmianie mapy."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr "Vsync"
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2707,11 +2768,11 @@ msgstr "Dostępne punkty umiejętności: %d"
 
 #: src/gui/skilldialog.cpp:385
 msgid "basic"
-msgstr ""
+msgstr "podstawowy"
 
 #: src/gui/skilldialog.cpp:386
 msgid "Skill: basic, Id: 1"
-msgstr ""
+msgstr "Skill: podstawowy, Id: 1"
 
 #: src/gui/skilldialog.cpp:420
 #, c-format
@@ -2726,7 +2787,7 @@ msgstr "Umiejętność %d"
 #: src/gui/skilldialog.cpp:438
 #, c-format
 msgid "Skill: %s, Id: %d"
-msgstr ""
+msgstr "Skill: %s, Id: %d"
 
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
@@ -2739,7 +2800,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "Poziom: %d(%+d)"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Gildia"
 
@@ -2771,7 +2832,7 @@ msgstr "Opuścić gildię?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Na pewno opuścić gildię %s?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupa"
 
@@ -2842,12 +2903,12 @@ msgstr "ZaproÅ›"
 #. TRANSLATORS: here P is title for visible players tab in social window
 #: src/gui/socialwindow.cpp:1278
 msgid "P"
-msgstr ""
+msgstr "V"
 
 #. TRANSLATORS: here F is title for friends tab in social window
 #: src/gui/socialwindow.cpp:1282
 msgid "F"
-msgstr ""
+msgstr "F"
 
 #: src/gui/socialwindow.cpp:1415
 #, c-format
@@ -2943,139 +3004,139 @@ msgstr "Wybierz nazwÄ™ grupy."
 msgid "Specials"
 msgstr "Specjalne"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Poziom: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "PieniÄ…dze: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Praca: %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Praca:"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr "Punkty postaci: %d"
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Poziom: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr "Punkty korekcyjne: %d"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Bez celu"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "Dozwól cel"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "Wymaga celu"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Ogólna Magia"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Magia Życia"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Magia Wojny"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Magia Transmutacji"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Magia Natury"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "Magia Astralna"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "Edytor poleceń"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "magia"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "inne"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "Symbol:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Polecenie:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Rodzaj celu:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "Ikona:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Poziom magii:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "Szkoła magii:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "Poziom szkoły:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Zachowaj"
 
@@ -3305,7 +3366,7 @@ msgstr "Obwódka lokalizacji domowej"
 msgid "Road Point"
 msgstr "Drogowskaz"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "Kto jest online- aktualizacja"
 
@@ -3313,15 +3374,15 @@ msgstr "Kto jest online- aktualizacja"
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "Gracze online- "
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "Gracze online- błąd"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Gracze online- aktualizacja"
 
@@ -3386,8 +3447,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Ta komenda uczyni <ksywka> operatorem kanału."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 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 (\")"
 
@@ -3425,38 +3486,38 @@ msgstr "Ogłoszenie ogólne od %s:"
 msgid "%s whispers: %s"
 msgstr "%s szepcze: %s"
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr "Polecenie: /invite <nick>"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr "To polecenie zaprasza <nick> do gildii, do której należysz."
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr "Polecenie: /leave"
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr "To polecenie sprawia że gracz opuszcza gildię."
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr "/help > Pokaż tą pomoc."
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > ZaproÅ› gracza do swojej gildii"
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Opuść swoją gildię"
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Wyrzuć kogoś ze swojej gildii"
 
@@ -3596,427 +3657,427 @@ msgstr "Magazyn"
 msgid "Cart"
 msgstr "Wózek"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr "Podstawowe klawisze"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Idź do góry"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Idź w dół"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Idź w lewo"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Idź w prawo"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Namierz i Atakuj"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "Podejdź do celu"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "Zmień sposób podchodzenia do celu"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr "Podejdź do lokacji domowej"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr "Ustaw lokacjÄ™ domowÄ…"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr "Podejdź do punktu nawigacyjnego"
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Zatrzymaj Atak"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr "Przestań namierzać"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "Celuj w najbliższe"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Namierz NPC"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Namierz Gracza"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "PodnieÅ›"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "Zmień sposób podnoszenia"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Ukryj Okna"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Usiądź"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Włącz/Wysłącz Handlowanie"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "Zmień widok mapy"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "Wybrano OK"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr "Klawisze skrótu"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr "Klawisz skrótu przedmiotu"
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Skrót przedmiotu %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr "Klawisze okien"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Okno Pomocy"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Okno statusu"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Okno Inwentarza"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Okno Ekwipunku"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Okno Umiejętności"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Okno Minimapy"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Okno Czatu"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Okno Skrótów przedmiotów"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Okno Ustawień"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Okno diagnostyczne"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "Okno społeczne"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Okno Skrótów Emotek"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "Okno strojów"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr "Okno sklepu"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr "Okno szybkiego upuszczania"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr "Okno statystyk bitewnych"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr "Okno poleceń"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr "Okno wykrywacza botów"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "Okno graczy online"
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "Okno \"Czy wiesz że...\""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr "Poprzednia zakładka społeczna"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr "Następna zakładka społeczna"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr "Klawisze emotek"
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Emotikonka"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Skrót Emotki %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr "Klawisze stroju"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "Nałóż strój"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr "Kopiuj strój"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr "Skopiuj ekwipunek do stroju"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr "Klawisze czatu"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Przełącznik Czatu"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Przewiń czat do góry"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Przewiń czat w doł"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Poprzednia zakładka czatu"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Następna zakładka czatu"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr "Zamknij bieżącą zakładkę czatu"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr "Poprzedni wiersz czatu"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr "Następny wiersz czatu"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr "Dopełnianie w czacie"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr "Wyłącz wpisywanie do czatu"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr "Inne"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ignoruj wprowadzenie 1"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ignoruj wprowadzenie 2"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr "Skieruj się w górę"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr "Skieruj się w dół"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr "Skieruj siÄ™ w lewo"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr "Skieruj siÄ™ w prawo"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr "Szalone ruchy"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr "Zmień tryb szalonych ruchów"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Szybkie upuszczenie N przedmiotów z pozycji 0"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr "Szybkie upuszczenie N przedmiotów"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr "Zmień licznik szybkiego upuszczania"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "Szybkie leczenie celu lub siebie"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr "Użyj zaklęcia #itenplz"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "Użyj magicznego ataku"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr "Przełącz magiczny atak"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr "Przełącz atak PvP"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr "Zmień tryb poruszania się"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr "Zmień rodzaj broni"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr "Zmień rodzaj ataku"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr "Zmień rodzaj podążania"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr "Zmień rodzaj imitacji"
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr "Włącz/ wyłącz klawisze modyfikatorów gry"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "Włącz/ wyłącz dźwięk"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "Włącz/ wyłącz tryb AFK"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr "Emuluj prawe kliknięcie klawiaturą"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr "Przełącz tryb kamery"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr "Klawisz modyfikatora"
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4025,42 +4086,42 @@ msgstr ""
 "Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić "
 "siÄ™ problemy."
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Zostałeś/aś zabity/a przez %s"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr "Nieznany problem podczas próby podniesienia przedmiotu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4068,396 +4129,396 @@ msgstr[0] "Podniosłeś/aś %d [@@%d|%s@@]."
 msgstr[1] "Podniosłeś/aś %d [@@%d|%s@@]."
 msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
-msgstr ""
+msgstr "xp"
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
-msgstr ""
+msgstr "skill"
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) domyślne poruszanie się"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr "(I) odwrócone ruchy"
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr "(c) trochę szalonych ruchów"
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr "(C) dużo szalonych ruchów"
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) podwójne normalne + szalone"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr "(?) nieznany sposób poruszania się"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) szalone ruchy numer %d"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr "(a) własne szalone ruchy"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr "(?) szalone ruchy"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr "(0) domyślne przybliżenie do celu"
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr "(1) podejdź do 1 pola od celu"
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr "(2) podejdź do 2 pól od celu"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr "(3) podejdź do 3 pól od celu"
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr "(5) podejdź do 5 pól od celu"
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr "(7) podejdź do 7 pól od celu"
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr "(A) podejdź do celu na zasięg ataku"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr "(a) zasięg ataku łucznika"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?) pól do celu"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr "(D) domyślne podążanie"
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr "(R) relatywne podążanie"
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr "(M) lustrzane podążanie"
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr "(P) niewolnicze podążanie"
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr "(?) nieznane podążanie"
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) atak"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) domyślny atak"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr "(s) zdejmij tarczÄ™ do ataku"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr "(S) załóż tarczę do ataku"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) idź, atakuj"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) idź, atakuj, podnieś"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) bez autoataku"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) podnoÅ› w promieniu 1x1"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) podnoÅ› w promieniu 2x1"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) podnoÅ› w promieniu 2x3"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) podnoÅ› w promieniu 3x3"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) podejdź i podnoś do 4 pól"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) podejdź i podnoś do 8 pól"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr "(A) podejdź i podnoś w zasięgu wzroku"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?) podnoÅ›"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) normalny widok mapy"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr "(D) widok debug"
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr "(u) płaska mapa"
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr "(U) płaska mapa 2"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) mapa bez tekstur"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b) dwukolorowa mapa"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) użyj #flar jako M.A."
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) użyj #chiza jako M.A."
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) użyj #ingrav jako M.A."
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) użyj #frillyar jako M.A."
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) użyj #upmarmu jako M.A."
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) magiczny atak"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr "(a) atakuj wszystkich graczy"
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
-msgstr ""
+msgstr "(f) atakuj niezaprzyjaźnionych"
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr "(b) atakuj nielubianych"
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
-msgstr "(d) nie atakuj nikogo"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr "(d) nie atakuj graczy"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr "(?) atak PvP"
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr "(D) domyślna imitacja"
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr "(O) Imituj strój"
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr "(?) imitacja"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "AFK"
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) przy klawiaturze"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) AFK"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) stan"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr "(G) tryb kamery gry"
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr "(F) wolny tryb kamery"
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr "Modyfikatory gry włączone."
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr "Modyfikatory gry wyłączone."
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr "Modyfikatory gry nieznane"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "Podążasz za: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr "Imitujesz: "
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr "Widzisz "
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opcje] [manaplus-file]"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)"
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr "                  używane do wprowadzania własnych parametrów"
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr "                  do klienta manaplus."
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Opcje:"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Używany plik logów"
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Używany katalog logów"
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Pokaż wersję"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Pokaż tą pomoc"
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Katalog konfiguracyjny"
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Zaloguj siÄ™ tym loginem"
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Zaloguj się tym hasłem"
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Zaloguj siÄ™ tÄ… postaciÄ…"
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Nazwa serwera lub IP"
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Port serwera"
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Użyj tego serwera aktualizacji"
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Wybierz domyślny serwer i postać"
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Omiń aktualizację"
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Katalog z danymi gry"
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Katalog z lokalnymi danymi"
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Katalog ze zrzutami ekranu"
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Rozpocznij grę w trybie bezpieczeństwa"
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr "  -T --test          :Rozpocznij test sterowników i autokonfigurację"
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Wyłącz OpenGL w tej sesji"
 
@@ -4694,45 +4755,45 @@ msgstr "Zostałeś/aś wykopany/a z gildii."
 msgid "%s has kicked from your guild."
 msgstr "%s wyrzucił/a Cię z gildii."
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > ZaproÅ› gracza do swojej grupy"
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Opuść swoją grupę"
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Wyrzuć kogoś z grupy"
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Pokaż/zmień stan dzielenia się przedmiotami w grupie"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Pokaż/zmień ustawienia grupy dotyczące dzielenia się punktami "
 "doświadczenia"
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr "To polecenie zaprasza <nick>  do Twojej drużyny."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr "To polecenie sprawia, że gracz opuszcza grupę."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr "Polecenie: /item <zasada>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr "To polecenie zmienia zasady dzielenia siÄ™ przedmiotami w grupie."
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4740,27 +4801,27 @@ msgstr ""
 "<zasada> to może być \"1\", \"yes\", \"true\" aby włączyć dzielenie się, lub "
 "\"0\", \"no\", \"false\" aby je wyłączyć."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr "Polecenie: /item"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "To polecenie pokazuje aktualny stan zasad dzielenia siÄ™ przedmiotami w "
 "grupie."
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr "Polecenie: /exp <zasada>"
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 "To polecenie zmienia aktualny stan zasad dzielenia siÄ™ punktami "
 "doświadczenia w grupie."
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -4768,47 +4829,47 @@ msgstr ""
 "<zasada> to może być \"1\", \"yes\", \"true\" żeby włączyć dzielenie się "
 "punktami doświadczenia, \"0\", \"no\", \"false\" żeby je wyłączyć."
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr "Polecenie: /exp"
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "To polecenie pokazuje aktualny stan zasad dzielenia siÄ™ punktami "
 "doświadczenia w grupie."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "WÅ‚Ä…czono dzielenie siÄ™ przedmiotami."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "Wyłączono dzielenie się przedmiotami."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "Nie można włączyć dzielenia się przedmiotami."
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr "Stan dzielenia siÄ™ przedmiotami nieznany."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "Podział doświadczenia włączony."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "Podział doświadczenia wyłączony."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 "Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica "
 "poziomów jest większa niż 10."
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr "Nieznany stan podziału doświadczenia."
 
@@ -4885,83 +4946,83 @@ msgstr "Login jest już w użyciu."
 msgid "Username permanently erased."
 msgstr "Login pernamentnie usunięty."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Nie udało się utworzyć grupy."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "Grupa utworzona z powodzeniem."
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s przyłączył/a się do Twojej drużyny."
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s już należy do grupy."
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s odrzucił/a Twoje zaproszenie."
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s został/a przyłączony/a do grupy."
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s nie może się przyłączyć, ponieważ grupa jest już pełna."
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ Nieznana odpowiedź na zaproszenie od %s."
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "Opuściłeś/aś grupę."
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s opuścił/a Twoją grupę."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Nieznany członek grupy chciał powiedzieć: %s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "JesteÅ› martwy/a."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Z ubolewaniem powiadamiamy, iż Twoja postać poległa w bitwie."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Już nie jesteś taki żywy."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 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/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Koniec gry!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "Wrzuć żeton aby kontynuować."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4969,79 +5030,79 @@ msgstr ""
 "Nie, dzieci. Wasza postać tak naprawdę nie zginęła. Ona... yyy... udała się "
 "do lepszego miejsca."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 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ą gardłem zawiódł."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Wydaje mi się, iż to nie poszło zbyt dobrze."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Czy chesz zidentyfikować swoje rzeczy?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Niestety, ślad po Tobie zaginął..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Unicestwiony."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Wygląda na to, że podano tobie twoją głowę."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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 ścieku i kup sobie nowe."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "Jeszcze nie umarłeś. Tylko sobie odpoczywasz."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr "Już Cię nie ma."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr "Twoja marna egzystencja może teraz odejść w zapomnienie."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr "Odeszłeś by spotkać się ze swym stwórcą."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr "JesteÅ› sztywniak."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr "Pozbawiony życia, spoczywasz w pokoju."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Gdybyś nie był wirtualny, wąchałbyś kwiatki od spodu."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr "Twoje procesy metaboliczne sÄ… teraz historiÄ…."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr "Wypadłeś z rozgrywki."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr "KopnÄ…Å‚eÅ› w kalendarz."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5049,26 +5110,26 @@ msgstr ""
 "Zrzuciłeś swą ziemską powłokę, wyniosłeś ducha poza doczesne wymiary i "
 "przyłączyłeś się do chórów anielskich."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr "JesteÅ› eks-graczem."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr "KopyrtnÄ…Å‚eÅ›."
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "Wiadomość"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia."
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać "
@@ -5658,24 +5719,24 @@ msgstr "Nie można było odnaleźć serwera."
 msgid "Connection to server terminated. "
 msgstr "Połączenie z serwerem przerwane."
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s nie jest w twojej grupie!"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr "Pisz '...'"
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr "Mruganie nicka"
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr "Bąbelek \"...\" nad głową"
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr "Bąbelek nad głową"
 
diff --git a/po/pt.po b/po/pt.po
index 21ce13a39..c08cad572 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,80 +10,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-05 23:09+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
-"pt/)\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 22:05+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/"
+"language/pt/)\n"
 "Language: pt\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"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr "Humano"
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "desviou"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "l"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -93,63 +97,63 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -158,160 +162,160 @@ msgstr ""
 "Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
 "já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
-msgstr "amigo"
+msgstr "amigo(a)"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador(a)!"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr "Inimigo"
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "Tamanho do cache de fonte"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr "Tamanho de Cache:"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
@@ -321,11 +325,11 @@ 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/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "Depurador"
 
@@ -386,18 +390,18 @@ msgstr "Comentário: %s"
 msgid "Bot Checker"
 msgstr "Analizador de bot"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Falar"
 
@@ -435,7 +439,7 @@ msgstr "Quantidade:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -443,25 +447,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Sair"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Loja"
 
@@ -485,8 +489,8 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Cancelar"
@@ -659,8 +663,8 @@ msgid "Enter password:"
 msgstr "Entre com a senha"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Excluir"
 
@@ -678,6 +682,7 @@ msgid "(empty)"
 msgstr "(vazio)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "padrão"
 
@@ -735,24 +740,23 @@ msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -776,7 +780,7 @@ msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Mapa"
 
@@ -851,62 +855,76 @@ msgstr "Contador de Texturas:"
 msgid "Particle count: %d"
 msgstr "Contagem de partículas: %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Alvo:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "ID do alvo:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
-msgstr "Nível do alvo:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr "Level do alvo:"
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr "Corrida do alvo:"
+
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr "Grupo do alvo:"
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
-msgstr "Guilda do alvo:"
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr "Guilda de alvo:"
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "Atraso de Ataque:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr "Dano Minimo:"
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr "Dano Máximo:"
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr "Dano Crítico:"
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Nível do alvo:"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Grupo do alvo:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Guilda do alvo:"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrada: %d bytes/s"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
@@ -933,8 +951,8 @@ msgstr "Próximo >"
 msgid "Auto open this window"
 msgstr "Abrir automaticamente esta janela"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -1046,7 +1064,7 @@ msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Armazenar"
 
@@ -1105,93 +1123,93 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "Resetar Status"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "Resetar tempo"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nível: %d em %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d faltando: %d"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d exp, avg mob para 1%%: %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s, total exp: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Avg Exp: %s, No de avg mob para o próximo nível: %s"
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Velocidade de exp por %d min: %s"
 msgstr[1] "Velocidade de exp por %d mins: %s"
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tempo para próximo nível por %d min: %s"
 msgstr[1] "Tempo para próximo nível por %d mins: %s"
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "Exp de última morte:"
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr "Tempo para próximo JackO:"
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "Tempo para próximo nível:  %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
-msgstr "JackOvai aparecer"
+msgstr "Aparição do JackO"
 
 #: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
 msgid "You have left the guild."
@@ -1279,7 +1297,7 @@ msgstr "Precisa"
 
 #: src/gui/npcdialog.cpp:52
 msgid "Stop waiting"
-msgstr "Pare de esperar"
+msgstr "Aguarde..."
 
 #: src/gui/npcdialog.cpp:53
 msgid "Next"
@@ -1290,7 +1308,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
@@ -1340,12 +1358,12 @@ msgstr "Sussuro"
 
 #: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
-msgstr "Curar:"
+msgstr "Curar"
 
 #: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
 #: src/gui/popupmenu.cpp:683
 msgid "Be friend"
-msgstr "Ser Amigo"
+msgstr "Ser Amigo(a)"
 
 #: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
 #: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
@@ -1356,7 +1374,7 @@ msgstr "Ser Amigo"
 #: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
 #: src/gui/popupmenu.cpp:728
 msgid "Disregard"
-msgstr "Ser inimigo"
+msgstr "Ser inimigo(a)"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
 #: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
@@ -1372,7 +1390,7 @@ msgstr "Lista Negra"
 #: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
 #: src/gui/popupmenu.cpp:703
 msgid "Set as enemy"
-msgstr "Definir como inimigo."
+msgstr "Definir como inimigo(a)"
 
 #: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
 #: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
@@ -1400,7 +1418,7 @@ msgstr "Não ignorar"
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1444,12 +1462,12 @@ msgstr "Chutar Jogador"
 
 #: src/gui/popupmenu.cpp:268
 msgid "Nuke"
-msgstr "Deixar pelado"
+msgstr "Desaparecer"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
 #: src/gui/popupmenu.cpp:829
 msgid "Show Items"
-msgstr "Mostar itens:"
+msgstr "Mostar itens"
 
 #: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
 #: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
@@ -1496,7 +1514,7 @@ msgstr "Adicionar a lista de ignorados"
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Jogadores"
 
@@ -1663,12 +1681,12 @@ msgstr "Mostrar"
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(padrão)"
@@ -1746,25 +1764,25 @@ msgstr "Conectar"
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Editar"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
@@ -1777,156 +1795,188 @@ msgstr "requer uma versão mais nova"
 msgid "requires v%s"
 msgstr "requer v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr "(sem som)"
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "�udio"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr "Configurações básicas"
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Habilitar �udio"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "Habilitar música"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "Habilitar sfx do jogo"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "Habilitar gui sfx"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "Habilitar música"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "Habilitar o chat de voz mumble \"requer aplicativo mumble\""
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "Baixar músicas"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "�udio"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Volume Sfx"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Anúncio"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr "Efeitos de som"
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
-"Talvez você precise reiniciar o cliente se você quiser baixar novas músicas"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr "Som do diálogo de informação"
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr "Som de pedidos"
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr "Som de mensagens de susurros"
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr "Som de mensagem de Guilda / Grupo "
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr "Destacar som de mensagens"
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr "Som de mensagens globais"
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Mecanismo de som"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr "Som de mensagens de erro"
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr "Som de pedidos de troca"
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "Outro"
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "Habilitar o chat de voz mumble \"requer aplicativo mumble\""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "Baixar músicas"
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Cores"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Remover mensagens coloridas do chat"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Mostrar lista de cores do chat"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Permitir feitiços e comandos de GM em todas abas"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "Limites"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Limite de caracteres na linha de chat"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Limite de linhas máximas no chat"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "Logs"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "Salvar conversas"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Mostrar mensagens antigas"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "Mensagens"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Esconder mensagens de loja"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "Abas"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Deixar as mensagens privadas em abas"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar as abas de chat caso precisar"
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "Tempo"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "Usar hora local"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "Outro"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr "Palavras Destacadas (separadas por vírgulas)"
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr "Ver mensagens MVP"
 
@@ -1977,41 +2027,41 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr "Usar joystick se a janela do jogo estiver inativa"
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
-msgstr "Girar o bastão e não pressionar os botões"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr "Gire o bastão sem precionar botões"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2033,456 +2083,460 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr "Habilitar rolagem suave"
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr "Rolagem suave"
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr "Velocidade de rolagem"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "Movendo"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr "Mensagem em modo Ausente"
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "Mostrar job"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr "A habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr "Habilitar protocolo de aviso"
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr "Suporte de bots"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr "Habilitar suporte ao AuctionBot "
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção contra bugs no servidor (não desabilitar)"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Melhor performance (Habilite para melhor performance)"
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr "Auto ajuste de performance"
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "Aceleração por HW"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr "Habilitar cache de transparência (Software, pode usar muita memória)"
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr "Habilitar redução de mapa (Software)"
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr "Melhor qualidade (Desative para melhor performace)"
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Habilitar correção de canal alpha (Software, pode ficar muito lento)"
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr "Mostrar transparencia "
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr "Habilitar reordenar sprites"
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Menos memória (Habilite para menos uso de memória)"
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr "Desabilitar cache avançado (Software)"
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr "Desabilitar cache (Software)"
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Mostrar gênero"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Mostrar nível"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr "Ativar segmentação prolongada de mouse"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "Jogadores(as) mortos(as) como alvo"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Nomes visíveis"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr "Trocas seguras"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr "Letras de nome inseguras"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr "Ver status"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr "Mostrar endereço de IP em Capturas de Tela"
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr "Permitir curar-se com o clique do mouse "
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr "Grupo de amigos na lista online"
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relação"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutro"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
-msgstr "Amigo"
+msgstr "Amigo(a)"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Desconsiderado"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Apagado"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr "Na Lista Negra "
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr "Inimigo"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Permitir negociações"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Antigo"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "Relações"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr "Chinês (China)"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr "Tcheco"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr "Inglês"
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr "Francês"
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr "Alemão"
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr "Indonésio"
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr "Polonês"
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr "Japonês"
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Holandês (Bélgica / Flandres)"
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr "Português"
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr "Português (Brasileiro)"
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr "Russo"
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr "Espanhol (castelhano)"
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr "Linguagem"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr "Fonte Segura"
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr "Font Jasponesa"
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2498,160 +2552,166 @@ msgstr "Rápido OpenGL"
 msgid "Safe OpenGL"
 msgstr "Seguro OpenGL"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Sem texto"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Texto"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Bolhas, sem nomes"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Bolhas com nomes"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "Desligado"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "Baixo"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "alto"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "médio"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "máximo"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Efeitos de partícula"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Mostrar aviso ao pegar algum item"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "em chat"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "Como partícula"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr "Habilitar redirecionamento de janela"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr "Sem moldura de janela"
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "Limite de FPS:"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "Limite de FPS alternativo:"
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr "Texto sobrescrito como:"
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "Transparência de janelas"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "Ambiente FX"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "Detalhe de partículas"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "Configurações de efeito de partícula modificadas."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr "Visual"
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr "Mostar notificações de coleta no chat"
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr "Mostrar notificações de coleta como efeito de particulas"
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr "Pegue a entrada do mouse e teclado"
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Transparência de janelas"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Sem texto"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Texto"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Bolhas, sem nomes"
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "As mudanças terão efeito ao mudar de mapa."
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Bolhas com nomes"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Texto sobrescrito como:"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "Desligado"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "Baixo"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "alto"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Ambiente FX"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Efeitos de partícula"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "médio"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "máximo"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "Detalhe de partículas"
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr "Gamma"
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr "on"
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr "Vsync"
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2702,11 +2762,11 @@ msgstr "Pontos de habilidade disponíveis: %d"
 
 #: src/gui/skilldialog.cpp:385
 msgid "basic"
-msgstr ""
+msgstr "básico"
 
 #: src/gui/skilldialog.cpp:386
 msgid "Skill: basic, Id: 1"
-msgstr ""
+msgstr "Habilidade: básico, Id: 1"
 
 #: src/gui/skilldialog.cpp:420
 #, c-format
@@ -2721,7 +2781,7 @@ msgstr "Habilidade %d"
 #: src/gui/skilldialog.cpp:438
 #, c-format
 msgid "Skill: %s, Id: %d"
-msgstr ""
+msgstr "Habilidade: %s, Id: %d"
 
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
@@ -2734,7 +2794,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guilda"
 
@@ -2766,7 +2826,7 @@ msgstr "Sair da guilda?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupo"
 
@@ -2938,139 +2998,139 @@ msgstr "Escolha o nome do seu grupo."
 msgid "Specials"
 msgstr "Especiais"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Sem alvo"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "Permitir alvo"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "Precisa de alvo"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Magia geral"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Magia Vida"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Magia Guerra"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Magia Transmutação"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Magia Natureza"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "Magia Astral"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "Editor de comandos"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "Feitiço"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "Outro"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "Símbolo: "
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Salvar"
 
@@ -3299,7 +3359,7 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -3307,15 +3367,15 @@ msgstr "Quem está online - Atualizando"
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3380,8 +3440,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Tornar <nick> operador do canal."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
 
@@ -3420,38 +3480,38 @@ msgstr "Anúncio geral de %s:"
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr "Comando: /invite <nick>"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Este comando convida <nick> para a guilda em que você está."
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr "Este comando faz com que o jogador saia da guilda."
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr "/help > Exibe esta ajuda."
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Convida um jogador para a sua guilda"
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Sai da guilda em que você está"
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Expulsa alguém da guilda em que você está"
 
@@ -3592,427 +3652,427 @@ msgstr "Armazém"
 msgid "Cart"
 msgstr "Carrinho"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr "Teclas básicas"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Mover para Cima"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Esquerda"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Direita"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Selecionar & Atacar"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "Mover para o alvo"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "Mudar o tipo de movimento ao alvo"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr "Mover para localização"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr "Definir localização"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr "Mover para ponto de navegação"
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Parar ataque"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr "Remover alvo"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "Selecionar alvo mais próximo"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Selecionar NPC"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Selecionar Jogador"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Pegar item"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Esconder janelas"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Sentar"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "Selecionar OK"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr "Teclas de atalho"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr "Atalhos de item"
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atalho para item %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr "Teclas de janelas"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Janela de Ajuda"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Janela de Status"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Janela de inventário"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Janela de equipamento"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Janela de Minimapa"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Janela de chat"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Janela de atalhos para itens"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Janela de Configurações"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Janela de Depuração"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "Janela social"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Janela de atalho para emoticons"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "Janela de roupas"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr "Janela Loja"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr "Janela Descarte rápido"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr "Janeja de mortes"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr "Janela Comandos"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr "Janela Analisador de bot"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "Janela Quem está online"
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "Janela Você sabia"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr "Aba social anterior"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr "Teclas de emoções"
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Emoticon"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para emoticon %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr "Teclas de vestuario"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr "Teclas de conversação"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr "Chat auto completar"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr "Desativar entrada de chat"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr "Outras teclas"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr "Para cima"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr "Para baixo"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr "Para esquerda"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr "Para direita"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo(a)"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr "Trocar ataque de pvp"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr "Modificar chave"
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4021,443 +4081,443 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto(a) por %s"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
-msgstr ""
+msgstr "exp"
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
-msgstr ""
+msgstr "Profissão"
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr "(?) Movimento desconhecido"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimento louco numero %d"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr "(a) Alcance de arqueiros"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr "(a) atacar todos inimigos"
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
-msgstr ""
+msgstr "(f) ataque todos, exceto amigos"
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
 msgstr "(d) não atacar jogadores"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr "(?) Ataque PVP"
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr "Modificador de jogo desconhecido"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr "Você vê "
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opções] [manaplus-arquivo]"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-arquivo] : O arquivo manaplus é um XML (.manaplus)"
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr "usado para definir parâmetros customizados"
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr "para o cliente manaplus. "
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Opções:"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Usar arquivo de log"
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Diretório para log de chat "
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Exibe a versão"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Exibe esta ajuda"
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Efetua login com este usuário"
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       :Efetua login com esta senha"
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      :Efetua login com este personagem"
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Nome ou IP do servidor de login"
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Porta do servidor de login"
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usa este host de update"
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Escolhe um personagem e um servidor de personagem "
 "padrão"
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Não faz downloads de atualização"
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Inicia o jogo em modo seguro"
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --testes          : Começar a testar drivers para auto configuração"
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Desabilita OpenGL nesta sessão"
 
@@ -4694,44 +4754,44 @@ msgstr "Você foi expulso da guilda."
 msgid "%s has kicked from your guild."
 msgstr "%s foi expulso(a) da Guilda."
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Convida um jogador para o seu grupo"
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Sai do grupo em que você está"
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Expulsa alguém do grupo em que você está"
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Mostra/Muda opções de compartilhamento de itens do grupo"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr "Este comando convida <nick> para o seu grupo."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr "Este comando faz com que o jogador saia do grupo."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr "Comando> /item <opção>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr "Este comando muda a opção de compartilhamento de itens do grupo."
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4739,24 +4799,24 @@ msgstr ""
 "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar compartilhamento "
 "de itens, ou \"0\", \"no\" e \"false\" para desabilitar."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr "Comando: /item"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Este comando exibe a atual opção de compartilhamento de itens do grupo."
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -4764,44 +4824,44 @@ msgstr ""
 "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar compartilhamento "
 "de experiência, ou \"0\", \"no\" e \"false\" para desabilitar."
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Este comando exibe a atual opção de compartilhamento de experiência do grupo."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens desconhecido."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência desconhecido."
 
@@ -4880,83 +4940,83 @@ msgstr "Este nome de usuário já está em uso."
 msgid "Username permanently erased."
 msgstr "Usuário deletado."
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Não foi possível criar o grupo."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "Grupo criado."
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s se junto ao grupo"
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s já é membro de um grupo."
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s recusou seu convite."
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s agora é um membro do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s não pode se juntar ao gupo cheio."
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ resposta de convite desconhecida por %s."
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "Você saiu do grupo."
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s saiu do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Um membro desconhecido tentou dizer: %s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Você está morto(a)."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 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/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Você não me parece assim tão vivo(a)."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 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/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Fim de jogo!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "Insira uma moeda para continuar."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4964,79 +5024,79 @@ msgstr ""
 "Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para "
 "um lugar melhor."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 "Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Eu acho que as coisas não correram tão bem."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Você quer uma identificação de suas posses?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Infelizmente, seus traços nunca foram encontrados..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Parece que te ofereceram sua própria cabeça."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "Você não morreu ainda. Está apenas descansando."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr "Você não é mais."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr "Você deixou de ser."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr "Você expirou e foi encontrar seu criador."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr "Você é um cadáver."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr "Sem vida, você descansa em paz."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 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/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr "Seus processos metabólicos agora são história."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr "Você bateu as botas."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr "Você chutou o balde."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5044,27 +5104,27 @@ msgstr ""
 "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito "
 "coro invisível."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr "Você é um(a) ex-jogador(a)."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr "Você foi desta para melhor."
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 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/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Você está carregando menos da metade de seu peso. Você vai recuperar-se "
@@ -5652,24 +5712,24 @@ msgstr "Não foi possível determinar o host \""
 msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr "Piscar nome"
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 92cc956a1..5e5c79c3b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,80 +12,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-05 23:09+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:59+0000\n"
+"Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
-"manaplus/team/pt_BR/)\n"
+"manaplus/language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "Mapa visivel "
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr "Humano"
+
+#: src/being.cpp:560
 msgid "dodge"
-msgstr "por nome"
+msgstr "desviou"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
-msgstr "por id"
+msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
-msgstr "por peso"
+msgstr "Configurar"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Performance"
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr "Temas"
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
-msgstr "por quantidade"
+msgstr "Saindo"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
-msgstr "por tipo"
+msgstr "Conectando ao servidor"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Habilitar rolagem suave"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Rolagem suave"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -95,63 +99,63 @@ msgstr "Mudando servidores do jogo"
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,160 +164,160 @@ msgstr ""
 "Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
 "já existe ou é você mesmo."
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
-msgstr "amigo"
+msgstr "amigo(a)"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "ignorado"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "neutro"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr "inimigo"
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "Jogador apagado com sucesso!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dia"
 msgstr[1] "%d dias"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "Tamanho de fonte Cache"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr "Tamanho de cache:"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "Criado:"
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
@@ -323,11 +327,11 @@ 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/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Geral"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "Depurador"
 
@@ -388,18 +392,18 @@ msgstr "Comentário: %s"
 msgid "Bot Checker"
 msgstr "Analizador de bot"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Nome"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Atacar"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Falar"
 
@@ -437,7 +441,7 @@ msgstr "Quantidade:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -445,25 +449,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Sair"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Máximo"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Loja"
 
@@ -487,8 +491,8 @@ msgstr "Vender"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Cancelar"
@@ -661,8 +665,8 @@ msgid "Enter password:"
 msgstr "Entre com a senha:"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Excluir"
 
@@ -680,6 +684,7 @@ msgid "(empty)"
 msgstr "(vazio)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "padrão"
 
@@ -737,24 +742,23 @@ msgstr "arco-íris 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chat"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
@@ -778,7 +782,7 @@ msgid "Ignore"
 msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Mapa"
 
@@ -853,62 +857,76 @@ msgstr "Contador de texturas:"
 msgid "Particle count: %d"
 msgstr "Contagem de partículas: %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Alvo:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "ID do alvo:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
-msgstr "Nível do alvo:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr "Level do alvo:"
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr "Raça do alvo:"
+
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr "Grupo do alvo:"
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr "Guilda do alvo:"
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "Atarso de ataque:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr "Hit minimo:"
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr "Hit máximo:"
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr "Hit crítico:"
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Nível do alvo:"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Grupo do alvo:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Guilda do alvo:"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Ping: %s ms"
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Entrada: %d bytes/s"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "Saída: %d bytes/s"
@@ -935,8 +953,8 @@ msgstr "Próximo >"
 msgid "Auto open this window"
 msgstr "Auto abrir esta janela"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "OK"
@@ -1048,7 +1066,7 @@ msgstr "Peso:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Armazenar"
 
@@ -1107,91 +1125,91 @@ msgstr ", "
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Estatísticas"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "Resetar Status"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "Resetar tempo"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Nível: %d em %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Exp: %d%d Falta: %d"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d ex, avg mob por 1%%: %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Mortes: %s Total exp: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Avg Exp: %s No. de avg mob para próximo nível: %s"
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Mortes/Min: %s Exp/Min: %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] "Velocidade de exp por %d min: %s"
 msgstr[1] "Velocidade de exp por %d mins: %s"
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] "Tempo para o próximo nível %d min: %s "
 msgstr[1] "Tempo para o próximo nível %d mins: %s "
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
-msgstr "Ultim exp por morte:"
+msgstr "Ultima exp por morte:"
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr "Tempo para próxima aparição do JackO:"
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "Tempo para próximo nível: %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr "Aparição do JackO"
 
@@ -1292,7 +1310,7 @@ msgid "Submit"
 msgstr "Enviar"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
@@ -1338,7 +1356,7 @@ msgstr "Negócios"
 
 #: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
-msgstr "Mensagem Privada:"
+msgstr "Sussurro"
 
 #: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
@@ -1347,7 +1365,7 @@ msgstr "Cura"
 #: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
 #: src/gui/popupmenu.cpp:683
 msgid "Be friend"
-msgstr "Ser amigo"
+msgstr "Ser amigo(a)"
 
 #: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
 #: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
@@ -1358,7 +1376,7 @@ msgstr "Ser amigo"
 #: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
 #: src/gui/popupmenu.cpp:728
 msgid "Disregard"
-msgstr "Ser inimigo"
+msgstr "Ser inimigo(a)"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
 #: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
@@ -1402,7 +1420,7 @@ msgstr "Não ignorar"
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1446,12 +1464,12 @@ msgstr "Chutar Jogador"
 
 #: src/gui/popupmenu.cpp:268
 msgid "Nuke"
-msgstr "Nu"
+msgstr "Desaparecer"
 
 #: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
 #: src/gui/popupmenu.cpp:829
 msgid "Show Items"
-msgstr "Mostrar itens:"
+msgstr "Mostrar itens"
 
 #: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
 #: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
@@ -1498,7 +1516,7 @@ msgstr "Adicionar a lista de ignorados"
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Jogadores"
 
@@ -1665,12 +1683,12 @@ msgstr "Mostrar"
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(padrão)"
@@ -1748,25 +1766,25 @@ msgstr "Conectar"
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Editar"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
@@ -1779,156 +1797,188 @@ msgstr "requer uma versão mais nova"
 msgid "requires v%s"
 msgstr "requer v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr "(sem som)"
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "�udio"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr "Configurações básicas"
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Habilitar �udio"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "Habilitar música"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "Habilitar sfx do jogo"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "Habilitar gui sfx"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "Habilitar música"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "Habilitar o chat de voz mumble (requer aplicativo mumble)"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "Baixar músicas"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "�udio"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Volume Sfx"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Volume da Música"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Anúncio"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr "Efeitos de som"
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
-"Talvez você precise reiniciar o cliente se você quiser baixar novas músicas"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr "Som de dialogo de informação"
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr "Requisitar som de dialogo"
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr "Som de mensagem de susurros"
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Mecanismo de som"
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr "Som de mensagem Guilda / Grupo "
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr "Destacar som de mensagem "
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr "Som de anuncios globais"
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr "Som de mensagem de erro"
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr "Som de convites de troca"
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "Outro"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "Habilitar o chat de voz mumble (requer aplicativo mumble)"
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "Baixar músicas"
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Cores"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Remover mensagens coloridas do chat"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Mostrar lista de cores do chat"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Permitir feitiços e comandos de GM em todas abas"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "Limites"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Limite de caracteres na linha de chat"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Limite de linhas máximas no chat"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "Logs"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "Salvar conversas"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Mostrar mensagens antigas"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "Mensagens"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Esconder mensagens de loja"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "Abas"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Deixar as mensagens privadas em abas"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "Salvar comandos de feitiços na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "Habilitar aba de negociação"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "Habilitar aba de batalha"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "Mostrar eventos de batalha"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr "Redimensionar aba de chat caso precisar"
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "Tempo"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "Usar tempo local"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "Outro"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr "Palavras destacadas (separadas em vírgulas)"
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr "Ver Mensagens MVP"
 
@@ -1979,41 +2029,41 @@ msgstr "Azul:"
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Calibrar"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr "Usar joystick se a janela do jogo estiver inativa"
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Parar"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
-msgstr "Gire o bastão e não aperte os botões"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr "Girar o bastão e não pressionar os botões"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2035,457 +2085,461 @@ msgstr "Padrão"
 msgid "Key Conflict(s) Detected."
 msgstr "Conflitos de teclas detectado."
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monstros"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Ver dano causado aos monstros"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "Auto-alvo apenas em inimigos acessíveis"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Destacar alcance de inimigos"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "Mostrar barra de hp dos monstros"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "Alvo de monstros em ciclo"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr "Mostrar partículas de warps"
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "Destacar portais do mapa"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Destacar itens no chão"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Destacar alcance de meu ataque"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr "Mostrar minimapas grandes"
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "Desenhar caminho"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr "Desenhar atalhos no mapa"
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr "Habilitar rolagem suave"
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr "Rolagem suave"
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr "Velocidade de rolagem"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "Movendo"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "Auto-ajustar posição"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "Atacar enquanto se move"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "Sincronizar movimento"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "Movimentos loucos"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "Jogador"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Mostrar minha barra de hp"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "Habilitar stats rápidos"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "Alvo de jogadores em ciclo"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "Mostrar mensagens de job exp"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "Mostrar popups de jogadores"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr "Mensagem em modo Ausente"
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "Mostrar job"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr "Habilitar filtro de ataque"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr "Habilitar o protocolo de aviso"
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Aceitar convites de compra/venda"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "Habilitar modo loja"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "Salvar diálogos com NPC"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr "Suporte de bots"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr "Habilitar suporte ao AuctionBot "
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr "Habilitar ataque do lado do servidor"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Habilitar Analisador de bot"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Habilitar proteção para servidores com bugs (não desabilitar)"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "Habilitar Depurador"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "Modo de baixo tráfego"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr "Ocultar sprite de escudo"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Mostrar imagem de fundo"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Melhor peformance (habilitar para melhor peformance)"
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr "Auto ajustar performance"
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "Aceleração por HW"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 "Habilitar cache de transparência (Software, pode se usar muita memória)"
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr "Habilitar redução de mapa (Software)"
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr "Melhor qualidade (desabilita para melhor performance)"
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr "Habilitar ajuste de canal alpha (Software, pode ficar muito lento)"
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr "Mostrar transparencia"
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr "Habilitar reordenar sprites."
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr "Menos memória (habilite para usar menos memória)"
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr "Desabilitar cache avançado (Software)"
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr "Desabilitar cache (Software)"
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Mostrar gênero"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Mostrar nível"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr "Ativar segmentação de mouse prolongado"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "Jogadores(as) mortos(as) como alvo"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Nomes visíveis"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr "Trocas seguras"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr "Letras inseguras no nome"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr "Mostrar status"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr "Mostrar endereço de IP em Capturas de Tela"
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr "Permitir se curar com o clique do mouse"
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr "Grupo de amigos que está na janela on-line"
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relação"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutro"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
-msgstr "Amigo"
+msgstr "Amigo(a)"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Desconsiderado"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Apagado"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr "Na Lista Negra "
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr "Inimigo"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Permitir negociações"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Antigo"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "Relações"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Minúsculo (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Pequeno (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Médio (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Largo (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Grande (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Enorme (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr "Chinês(China)"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr "Tcheco"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr "Inglês"
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr "Finlandês"
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr "Francês"
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr "Alemão"
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr "Indonésio"
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr "Polonês"
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr "Japonês"
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Holandês"
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr "Português"
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr "Português (Brasileiro)"
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr "Russo"
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr "Espanhol"
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "Tema"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr "Linguagem"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "Fonte"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Fonte negrito"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "Fonte de particulas"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "Fonte de ajuda"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr "Fonte segura"
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr "Fontes japonesas"
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Tema alterado"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -2501,160 +2555,166 @@ msgstr "Rápido OpenGL"
 msgid "Safe OpenGL"
 msgstr "Seguro OpenGL"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Sem texto"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Texto"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Bolhas, sem nomes"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Bolhas com nomes"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "Desligado"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "baixo"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "alto"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "médio"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "máximo"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Efeitos de partícula"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Mostrar aviso ao pegar algo"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "em chat"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "Como partícula"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr "Habilitar redimensionamento de janela"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr "Sem moldura de janela"
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "Limite de FPS:"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "Limite de FPS alternativo: "
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr "Texto sobrescrito como:"
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "Transparência de janelas"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "Ambiente FX"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "Detalhe de partículas"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "Nenhum"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "Configurações de efeito de partícula modificadas."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr "Visual"
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr "Mostrar notificações de coleta no bate-papo"
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr "Mostrar notificações de coleta como particula"
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr "Pegue a entrada do mouse e teclado"
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Transparência de janelas"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Sem texto"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Texto"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Bolhas, sem nomes"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Bolhas com nomes"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Texto sobrescrito como:"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "Desligado"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "baixo"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "alto"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Ambiente FX"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Efeitos de partícula"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "médio"
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "As mudanças terão efeito ao mudar de mapa."
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "máximo"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "Detalhe de partículas"
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr "Gamma"
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr "on"
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr "Vsync"
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2705,11 +2765,11 @@ msgstr "Pontos de habilidade disponíveis: %d"
 
 #: src/gui/skilldialog.cpp:385
 msgid "basic"
-msgstr ""
+msgstr "básico"
 
 #: src/gui/skilldialog.cpp:386
 msgid "Skill: basic, Id: 1"
-msgstr ""
+msgstr "Habilidade: báico, Id: 1"
 
 #: src/gui/skilldialog.cpp:420
 #, c-format
@@ -2724,7 +2784,7 @@ msgstr "Habilidade %d"
 #: src/gui/skilldialog.cpp:438
 #, c-format
 msgid "Skill: %s, Id: %d"
-msgstr ""
+msgstr "Habilidade: %s, Id: %d"
 
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
@@ -2737,7 +2797,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Guilda"
 
@@ -2769,7 +2829,7 @@ msgstr "Sair da guilda?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupo"
 
@@ -2941,139 +3001,139 @@ msgstr "Escolha o nome do seu grupo."
 msgid "Specials"
 msgstr "Especiais"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Job: %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Job:"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Nível: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Sem alvo"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "Permitir alvo"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "Precisa de alvo"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Magia geral"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Magia Vida"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Magia Guerra"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Magia Transmutação"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Magia Natureza"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "Magia Astral"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "Editor de comandos"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "Feitiço"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "Outro"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "Símbolo: "
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Mana:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Tipo de alvo:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "Icone:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Nível mágico:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "Escola de Feitiço:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "Nível da escola:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Salvar"
 
@@ -3302,7 +3362,7 @@ msgstr "Borda do Lugar Inicial"
 msgid "Road Point"
 msgstr "Ponto de estrada"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -3310,15 +3370,15 @@ msgstr "Quem está online - Atualizando"
 msgid "Update"
 msgstr "Atualizar"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "Quem está online - "
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -3383,8 +3443,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Tornar <nick> operador do canal."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
 
@@ -3423,38 +3483,38 @@ msgstr "Anúncio geral de %s:"
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr "Comando: /invite <nick>"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Este comando convida <nick> para a guilda em que você está."
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr "Este comando faz com que o jogador saia da guilda."
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr "/help > Exibe esta ajuda."
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Convida um jogador para a sua guilda"
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Sai da guilda em que você está"
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Expulsa alguém da guilda em que você está"
 
@@ -3595,427 +3655,427 @@ msgstr "Armazém"
 msgid "Cart"
 msgstr "Carrinho"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr "Teclas básicas"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Mover para Cima"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Esquerda"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Direita"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Selecionar & Atacar"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "Mover para o alvo"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "Mudar o tipo de movimento ao alvo"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr "Mover para localização"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr "Definir localização"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr "Mover para ponto de navegação"
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Parar ataque"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr "Remover alvo"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "Selecionar alvo mais próximo"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Selecionar NPC"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Selecionar Jogador"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Pegar item"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Esconder janelas"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Sentar"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "Selecionar OK"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr "Teclas de atalho"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr "Atalhos de item"
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atalho para item %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr "Teclas de janelas"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Janela de Ajuda"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Janela de Status"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Janela de inventário"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Janela de equipamento"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Janela de Habilidade"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Janela de Minimapa"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Janela de chat"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Janela de atalhos para itens"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Janela de Configurações"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Janela de Depuração"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "Janela social"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Janela de atalho para emoticons"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "Janela de roupas"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr "Janela Loja"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr "Janela Descarte rápido"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr "Janela de estado de mortes"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr "Janela Comandos"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr "Janela Analisador de bot"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "Janela Quem está online"
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "Janela Você Sabia "
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr "Aba social anterior"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr "Próxima aba social"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr "Teclas de emoções"
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Emoticon"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para emoticon %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr "Teclas de vestuario"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr "Copiar roupa equipada"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr "Teclas de conversasão"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr "Fechar aba de chat atual"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr "Linha de chat anterior"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr "Próxima linha de chat"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr "Chat auto completar"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr "Desativar entrada de chat"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr "Outras teclas"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr "Para cima"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr "Para baixo"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr "Para esquerda"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr "Para direita"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr "Movimentos loucos"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr "Trocar Modo de movimentos loucos"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Descartar rapidamente N itens do slot 0"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr "Descartar rapidamente N itens"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr "Mudar contador de descarte"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "Curar um alvo ou você mesmo(a)"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr "Usa feitiço #itenplz"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "Usar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr "Trocar feitiço de ataque"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr "Mudar ataque em pvp"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr "Mudar tipo de movimento"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr "Mudar tipo de ataque de arma"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr "Mudar tipo de ataque"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr "Mudar modo de seguir"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr "Mudar modo de imitação"
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr "Habilitar / Desabilitar Chaves de modificação"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "Ligar / Desligar áudio"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "Habilitar / Desabilitar modo indisponivel "
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr "Emular botão direito do teclado"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr "Alterar modo de camera"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr "Chave de modificação"
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4024,442 +4084,442 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Você foi morto(a) por %s"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
-msgstr ""
+msgstr "exp"
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
-msgstr ""
+msgstr "profissão"
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr "(?) movimento desconhecido"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimento louco número %d"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr "(a) Alcance ataque de arqueiro"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr "(a) atacar qualquer jogador"
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
-msgstr ""
+msgstr "(f) ataque todos, exceto amigos"
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
 msgstr "(d) não atacar jogadores"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr "(?) ataque em pvp"
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) Modo Ausente"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr "Modificadores são desconhecidos"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr "Você vê "
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr "Manaplus [opções] [manaplus-arquivo]"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[Manaplus-Arquivo]: O arquivo Manaplus é um arquivo XML (.manaplus)"
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr "Usado para parâmetros customizados"
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr "Para o cliente Manaplus."
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Opções:"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Usar arquivo de log"
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Diretório para log de chat "
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Exibe a versão"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Exibe esta ajuda"
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Efetua login com este usuário"
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       :Efetua login com esta senha"
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      :Efetua login com este personagem"
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Nome ou IP do servidor de login"
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Porta do servidor de login"
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usa este host de update"
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Escolhe um personagem e um servidor de personagem "
 "padrão"
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Não faz downloads de atualização"
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Inicia o jogo em modo seguro"
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr "  -T --testes          : Começa a testar drivers e a auto-configurar"
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Desabilita OpenGL nesta sessão"
 
@@ -4696,44 +4756,44 @@ msgstr "Você foi expulso da guilda."
 msgid "%s has kicked from your guild."
 msgstr "%s foi expulso(a) da Guilda."
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Convida um jogador para o seu grupo"
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Sai do grupo em que você está"
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Expulsa alguém do grupo em que você está"
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Mostra/Muda opções de compartilhamento de itens do grupo"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr "Este comando convida <nick> para o seu grupo."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr "Este comando faz com que o jogador saia do grupo."
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr "Comando> /item <opção>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr "Este comando muda a opção de compartilhamento de itens do grupo."
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4741,24 +4801,24 @@ msgstr ""
 "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar compartilhamento "
 "de itens, ou \"0\", \"no\" e \"false\" para desabilitar."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr "Comando: /item"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Este comando exibe a atual opção de compartilhamento de itens do grupo."
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <policy>"
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -4766,44 +4826,44 @@ msgstr ""
 "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar compartilhamento "
 "de experiência, ou \"0\", \"no\" e \"false\" para desabilitar."
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr "Comando: /exp"
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Este comando exibe a atual opção de compartilhamento de experiência do grupo."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens desconhecido."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência desconhecido."
 
@@ -4882,83 +4942,83 @@ msgstr "Este nome de usuário já está em uso."
 msgid "Username permanently erased."
 msgstr "Usuário apagado permanentemente. "
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "Não foi possível criar o grupo."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "Grupo criado."
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s se juntou ao grupo"
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s já é membro de um grupo."
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s recusou seu convite."
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s agora é um membro do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s não pode se juntar ao grupo cheio."
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ resposta de convite desconhecida por %s."
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "Você saiu do grupo."
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s saiu do seu grupo."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Um membro desconhecido tentou dizer: %s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Você está morto."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Lamentamos informar que seu personagem foi morto(a) em combate."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Você não me parece assim tão vivo."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 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/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Fim de jogo!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "Insira uma moeda para continuar."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4966,79 +5026,79 @@ msgstr ""
 "Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para "
 "um lugar melhor."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 "Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Eu acho que as coisas não correram tão bem."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Você quer uma identificação de suas posses?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Infelizmente, seus traços nunca foram encontrados..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Aniquilado."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Parece que te ofereceram sua própria cabeça."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "Você não morreu ainda. Está apenas descansando."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr "Você não é mais."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr "Você deixou de ser."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr "Você expirou e foi encontrar seu criador."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr "Você é um cadáver."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr "Sem vida, você descansa em paz."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 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/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr "Seus processos metabólicos agora são história."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr "Você bateu as botas."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr "Você chutou o balde."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5046,27 +5106,27 @@ msgstr ""
 "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito "
 "coro invisível."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr "Você é um ex-jogador(a)"
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr "Você foi desta para melhor."
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 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/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Você está carregando menos ou metade de seu peso. Você pode recuperar-se "
@@ -5654,24 +5714,24 @@ msgstr "Não foi possível determinar o host \""
 msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida. "
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr "Piscar nome"
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr "Bolha '...' flutuante"
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr "Bolha Flutuante"
 
diff --git a/po/ru.po b/po/ru.po
index 5d32213fe..d878c88ed 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,11 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-05 23:11+0000\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:42+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
-"ru/)\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/"
+"language/ru/)\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,69 +23,73 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr "Человек"
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "уворот"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "Б"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "�а�тройка"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "Производительно�ть"
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "Видео"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr "Темы"
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "Идет подключение к �ерверу..."
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "�вторизаци�"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "Получение �пи�ка пер�онажей"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому �ерверу"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "Смена игрового �ервера"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -95,63 +99,63 @@ msgstr "Смена игрового �ервера"
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "Запро� реги�трационных данных"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "Реги�траци� удалена"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайте�ь в любое врем�..."
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не �уще�твует, и не может быть �оздано! Выход."
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "�екорректный �ервер обновлений: %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Ошибка �оздани� директории дл� обновлений!"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не �уще�твует, и не может быть �оздан! Выход."
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "�еизве�тна� команда."
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "�ельз� отправл�ть пу�тые �ообщени�!"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -160,105 +164,105 @@ msgstr ""
 "�евозможно �оздать вкладку дл� личного общени� � игроком \"%s\"! Или вкладка "
 "уже �оздана, или �тот игрок Вы �ами."
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Запро� на при�оединение к каналу %s."
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "�е указано название группы"
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "�е задано им� гильдии."
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "Пожалуй�та, укажите им�"
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Enter переключает Ва� на окно чата."
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Теперь �ообщение закрывает чат."
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "друг"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "нейтральный"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорирует��!"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из �пи�ка игнорировани�!"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr "добавлен в черный �пи�ок"
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr "враг"
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "Игрок удален!"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Врем� работы клиента: %s"
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -266,7 +270,7 @@ msgstr[0] "%d недел�"
 msgstr[1] "%d недели"
 msgstr[2] "%d недель"
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -274,7 +278,7 @@ msgstr[0] "%d день"
 msgstr[1] "%d дн�"
 msgstr[2] "%d дней"
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -282,7 +286,7 @@ msgstr[0] "%d ча�"
 msgstr[1] "%d ча�а"
 msgstr[2] "%d ча�ов"
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -290,7 +294,7 @@ msgstr[0] "%d минута"
 msgstr[1] "%d минуты"
 msgstr[2] "%d минут"
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -298,27 +302,27 @@ msgstr[0] "%d �екунда"
 msgstr[1] "%d �екунды"
 msgstr[2] "%d �екунд"
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "размер кеша шрифта"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr "Размер кеша:"
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "Создано:"
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "Удалено:"
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr "Изображений:"
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
@@ -329,11 +333,11 @@ msgstr ""
 "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
 "\"0\"."
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Общие"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "Отладка"
 
@@ -394,18 +398,18 @@ msgstr "Комментарий: %s"
 msgid "Bot Checker"
 msgstr "Окно детектора ботов"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Им�"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "�така"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Разговор"
 
@@ -443,7 +447,7 @@ msgstr "Количе�тво:"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -451,25 +455,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Выход"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Мак�"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Магазин"
 
@@ -493,8 +497,8 @@ msgstr "Продать"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Отмена"
@@ -667,8 +671,8 @@ msgid "Enter password:"
 msgstr "Введите пароль:"
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Удалить"
 
@@ -686,6 +690,7 @@ msgid "(empty)"
 msgstr "(пу�то)"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "По умолчанию"
 
@@ -743,24 +748,23 @@ msgstr "радуга 3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "При�ут�твуют: %s; В�его %d игроков."
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
@@ -784,7 +788,7 @@ msgid "Ignore"
 msgstr "Игнорировать"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Карта"
 
@@ -859,62 +863,76 @@ msgstr "Количе�тво тек�тур:"
 msgid "Particle count: %d"
 msgstr "Количе�тво ча�тиц: %d"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "Цель:"
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "Id цели:"
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr "Уровень цели:"
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr "Ра��а цели:"
+
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr "Группа цели:"
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr "Гильди� цели:"
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "Задержка атаки:"
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr "Минимальный удар:"
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr "Мак�имальный удар:"
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr "Критиче�кий удар:"
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "Уровень цели:"
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "Группа цели:"
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "Гильди� цели:"
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr "Пинг: %s м�."
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "Вх.: %d байт/�ек."
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr "И�х.: %d байт/�ек."
@@ -941,8 +959,8 @@ msgstr "Следующий >"
 msgid "Auto open this window"
 msgstr "�втоматиче�ки открывать �то окно"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "ОК"
@@ -1054,7 +1072,7 @@ msgstr "Ве�:"
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Сохранить"
 
@@ -1113,55 +1131,55 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "Ве�: %s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "Окно �тати�тики атак"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "Сбро�ить �тат."
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "Сбро�ить таймер"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "Уровень: %d на %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr "Опыт: %d/%d О�тало�ь: %d"
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr "1%% = %d опыта, �реднее кол-во мобов дл� 1%%: %s"
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr "Убий�тв: %s, опыта: %s"
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr "Средний опыт: %s, �реднее кол-во мобов до �лед. уровн�: %s"
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr "Убий�тв в минуту: %s, Опыта в минуту: %s"
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1169,7 +1187,7 @@ msgstr[0] "Опыт за %d мин.: %s"
 msgstr[1] "Опыт за %d мин.: %s"
 msgstr[2] "Опыт за %d мин.: %s"
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1177,29 +1195,29 @@ msgstr[0] "Врем� до �ледующего уровн� в мин. %d: %s"
 msgstr[1] "Врем� до �ледующего уровн� в мин. %d: %s"
 msgstr[2] "Врем� до �ледующего уровн� в мин. %d: %s"
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "Опыт за по�леднее убий�тво:"
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr "Врем� до по�влени� jacko:"
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr "  Врем� до �ледующего уровн�: %s"
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr "jacko по�вл�ет��"
 
@@ -1300,7 +1318,7 @@ msgid "Submit"
 msgstr "Применить"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
@@ -1410,7 +1428,7 @@ msgstr "�е игнорировать"
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "@@ignore|Полно�тью игнорировать@@"
 
@@ -1506,7 +1524,7 @@ msgstr "Добавить в �пи�ок игнорировани�"
 msgid "Add name to chat"
 msgstr "Добавить им� в чат"
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "Игроки"
 
@@ -1673,12 +1691,12 @@ msgstr "Показать"
 msgid "Reset yellow bar"
 msgstr "�бро�ить на�тройки"
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(по умолчанию)"
@@ -1756,25 +1774,25 @@ msgstr "Соединить��"
 msgid "Add"
 msgstr "Добавить"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "Изменить"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение �пи�ка �ерверов...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от �ервера"
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "�е удало�ь получить �пи�ок �ерверов!"
 
@@ -1787,156 +1805,188 @@ msgstr "требует�� более нова� вер�и�"
 msgid "requires v%s"
 msgstr "требует�� v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr "(без звука)"
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "�удио"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr "О�новные на�тройки"
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "Включить �удио"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "Включить музыку"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "Включить игровые �ффекты"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "Включить �ффекты интерфей�а"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "Включить музыку"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "Включить голо�овой чат mumble"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "Скачать музыку"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "�удио"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Громко�ть �ффектов"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Громко�ть музыки"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "Внимание"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr "Звуковые �ффекты"
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
-"Возможно потребует�� перезагрузка игры, е�ли вы хотите �качать новую музыку"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr "Звук информационного диалога"
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr "Звук вопро�а"
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr "Звук криватного �ообщени�"
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr "Звук �ообщени� в гильдии или группе"
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr "Звук под�ветки"
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr "Зук глобального �ообщени�"
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr "Звук ошибки"
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr "Звук обмена"
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "Другое"
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "Включить голо�овой чат mumble"
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "Звуковой движок"
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "Скачать музыку"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "Удалить цвета из полученных �ообщений в чате"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "Показать �пи�ок цветов чата"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "Команды"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "Разрешить магиче�кие и админи�тратор�кие команды на в�ех вкладках"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "Ограничени�"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr "Ограничить чи�ло �имволов в �троке чата"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "Ограничить чи�ло �трок в чате"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "Логи"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "Включить лог чата"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "Показать и�торию чата"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "Сообщени�"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "Скрыть �ообщени� магазина"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "Страницы"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Личные �ообщени� во вкладках"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr "О�тавл�ть �ообщени� магии на вкладке отладки"
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "Показывать �ообщени� �ервера на вкладке отладки"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "Включить вкладки торговли"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "Включить вкладку бо�"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "Показать �ообщени� бо�"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr "Подгон�ть размер чата"
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "Врем�"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "И�пользовать ме�тное врем�"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "Другое"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr "Под�вечиваемые �лова (разделенные зап�тыми)"
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr "Показывать MVP �ообщени�"
 
@@ -1987,40 +2037,40 @@ msgstr "Синий:"
 msgid "Alpha:"
 msgstr "Прозрачно�ть:"
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Применить"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Сбро�ить ра�положение окон"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "�ажмите кнопку, чтобы начать калибровку"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Калибровать"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "И�пользовать джой�тик"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr "И�пользовать джой�тик е�ли игра �вернута"
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Джой�тик"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Стоп"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr "Вращайте �тик и не нажимайте другие кнопки"
 
 #: src/gui/setup_keyboard.cpp:80
@@ -2043,461 +2093,465 @@ msgstr "По умолчанию"
 msgid "Key Conflict(s) Detected."
 msgstr "Обнаружен(ы) конфликт(ы) клавиш!"
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "Разное"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Мон�тры"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "Показ. повр., нане�енные мон�трам"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "�втоприцел по до�тупным мон�трам"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "Под�ветка радиу�а атаки мон�тров"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "Показывать жизнь мобов"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr "Прокручивать прицел по мон�трам"
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr "Показывать анимацию порталов"
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "Под�ветка точек перехода на карте"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "Под�ветка предметов на полу"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "Под�ветка радиу�а атаки игрока"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr "Показывать ра�ширенные миникарты"
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "Ри�овать путь"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr "Ри�овать клавиши на карте"
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr "Включить ленивую прокрутку"
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr "ленива� прокрутка"
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr "радиу� прокрутки"
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "Движени�"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "�вто. и�прав. позиции"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "�таковать в движении"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "Синх. движение"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "Программа дл� �ума�шедших движений A"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "Игрок"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "Показывать �вою жизнь"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "Включить бы�трую �мену �татов"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr "Прокручивать прицел по игрокам"
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "Показывать опыт работы."
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "Показ. в�плыв. �ообщени� игроков"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr "Ответ в режиме \"отошел\""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "Показывать уровень работы"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr "Включить фильтр атак"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr "Включить режим по�ылки �о�то�ни�"
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "Принимать запро�ы купить/продать"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "Включить режим магазина"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "Сохран�ть тек�т NPC"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr "Поддержка ботов"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr "Включить поддержку бота аукционов"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr "Включить поддержку гильд-бота"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr "Включить �ерверную атаку"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "Включить детектор ботов"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr "Включить защиту от бажных �ерверов (не выключать!)"
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "Включить отлад. лог"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "Режим кешировани� игроков"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr "Спр�тать картинку �чита"
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "Показать фон"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr "Улучшение производительно�ти (включите дл� большей производительно�ти)"
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr "�втоматиче�ки под�траивать производительно�ть"
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "�ппаратное у�корение"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 "Включить кеш прозрачно�ти (программный режим, может и�пользовать много "
 "пам�ти)"
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr "Включить оптимизацию карты (программный режим)"
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr "Улучшение каче�тва (выключите дл� лучшей производительно�ти)"
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 "Включить и�правление альфа канала (программный режим, может быть очень "
 "медленным)"
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr "Отображать прозрачно�ть на пер�онажах и мон�трах"
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr "Включить пере�тановку �прайтов"
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 "Уменьшенное потребление пам�ти (включите дл� меньшего потреблени� пам�ти)"
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr "Выключить ра�ширенное кеширование �ущно�тей (программный режим)"
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr "Выключить кеширование �ущно�тей (программный режим)"
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "Показать пол"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "Показать уровень"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "Показать �вое им�"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr "Включить ра�ширенное наведение мыши"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "�аводить фоку� на мертвых игроков"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Видимые имена"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr "Защитить торговлю"
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr "�ебезопа�ные �имволы"
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr "Показывать �тату�ы"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr "Показывать ip адре�а на �нимках �крана"
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr "Включить �амолечение по клику мыши"
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr "Группировать друзей в окне онлайн �пи�ка"
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Отношение"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "�ейтральное"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Друг"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Пренебрегаемый"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Игнорировано"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "Стерт"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr "В черном �пи�ке"
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr "Враг"
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Разрешить торговлю"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Разрешить шептание"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "Старые"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "Св�зи"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Когда игнорирует��:"
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "Маленький (10)"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "Маленький (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "Средний (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "Большой (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "Боьшой (14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "Огромный (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr "Китай�кий"
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr "Чеш�кий"
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr "�нглий�кий"
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr "Фин�кий"
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr "Француз�кий"
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr "�емецкий"
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr "Индонезий�кий"
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr "Поль�кий"
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr "Япон�кий"
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr "Голланд�кий (Бельгий�кий / Фламанд�кий)"
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr "Португаль�кий"
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr "Португаль�кий (Бразиль�кий)"
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr "Ру��кий"
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr "И�пан�кий (Ка�тиль�кий)"
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "Тема"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "Тема интерфей�а"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr "Язык"
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "О�новной шрифт"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "Жирный шрифт"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "Шрифт ча�тиц"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "Шрифт помощи"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr "Безопа�ный шрифт"
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr "Япон�кий шрифт"
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Размер шрифта"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "Тема изменена"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Перезегрузите игру дабы изменени� в�тупили в �илу."
 
@@ -2513,162 +2567,168 @@ msgstr "Бы�трый OpenGL"
 msgid "Safe OpenGL"
 msgstr "Безопа�ный OpenGL"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "�ет тек�та"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Тек�т"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Пузырьки, без названий"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Пузырьки � названи�ми"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "выкл"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "низ."
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "вы�."
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "�редне"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "мак�."
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "�а полный �кран"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Игровой кур�ор"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "Эффекты ча�тиц"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "Показать уведомление о подборе предмета"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "в чате"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "как ча�тицу"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr "Разрешить мен�ть размер окна"
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr "Без рамки"
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "Ограничить кадр/�:"
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr "�льтер. ограничить кадр/�: "
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr "Тек�т над головами"
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "�епрозрачно�ть интерфей�а"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "Эффекты окружающей �реды"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "Детализаци� ча�тиц"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "�ет"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "�е удало�ь переключить�� в оконный режим. Во��тановить �тарый режим также не "
 "удало�ь!"
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "�е удало�ь переключить�� в полно�кранный режим. Во��тановить �тарый режим "
 "также не удало�ь!"
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "Переключение в полно�кранный режим"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Дл� в�туплени� в �илу выбранных на�троек требует�� перезагрузка игры."
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Дл� изменени� режима OpenGL необходима перезагрузки игры."
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "�овое разрешение:                   "
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "Разрешение �крана изменено"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "�екоторые окна могут быть �двинуты, чтобы уме�тить�� на �кране при меньшем "
 "разрешении"
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "�а�тройки �ффектов ча�тиц изменены."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr "Графика"
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr "Показывать в чате �ообщени� о подн�тых предметах"
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "Изменени� в�туп�т в �илу по�ле загрузки новой карты."
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr "Показывать �ообщени� о подн�тых предметах в виде �ффектов"
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr "Захватывать ввод � клавиатуры и мыши"
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "�епрозрачно�ть интерфей�а"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "�ет тек�та"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Тек�т"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Пузырьки, без названий"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Пузырьки � названи�ми"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Тек�т над головами"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "выкл"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "низ."
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "вы�."
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Эффекты окружающей �реды"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Эффекты ча�тиц"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "�редне"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "мак�."
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "Детализаци� ча�тиц"
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr "Гамма"
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr "вкл."
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr "Вертикальна� �инхронизаци�"
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2751,7 +2811,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "Уровень: %d (%+d)"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Гильди�"
 
@@ -2783,7 +2843,7 @@ msgstr "Покинуть Гильдию?"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы дей�твительно хотите выйти из гильдии %s?"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Группа"
 
@@ -2955,139 +3015,139 @@ msgstr "Выберите им� будущей группы."
 msgid "Specials"
 msgstr "О�обые"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Деньги: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "ОЖ:"
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "Мана:"
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Профе��и�: %d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Профе��и�:"
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr "Очки пер�онажа: %d"
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "Уровень: %d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr "Очков навыков: %d"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "Без цели"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr "Разрешить цель"
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr "�еобходима цель"
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr "Обща� Маги�"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "Маги� Жизни"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "Боева� Маги�"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "Маги� Тран�формации"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "Маги� Природы"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "��тральна� маги�"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "Редактор команд"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "Маги�"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "Другое"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "Символ:"
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "Команда:"
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "Мана:"
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "Тип цели:"
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "Картинка:"
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "Уровень Магии:"
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "Школа Магии:"
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "Уровень школы:"
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "Сохранить"
 
@@ -3317,7 +3377,7 @@ msgstr "Бордюр домашней позиции"
 msgid "Road Point"
 msgstr "Точка дороги"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
@@ -3325,15 +3385,15 @@ msgstr "Кто онлайн - обновление"
 msgid "Update"
 msgstr "Обновить"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -3398,8 +3458,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Эта Команда делает <пользователь> оператором канала."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Е�ли ник �одержит пробелы, заключите его в кавычки (\")."
 
@@ -3438,38 +3498,38 @@ msgstr "Глобальное объ�вление от %s:"
 msgid "%s whispers: %s"
 msgstr "%s шепчет: %s"
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr "Команда: /invite <игрок>"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Эта команда приглашает <им� пер�онажа> к Вам в группу."
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr "Команда: /leave"
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr "Эта команда за�тавл�ет игрока покинуть гильдию."
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr "/help > Показать �ту �правку"
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > Пригла�ить игрока в Вашу гильдию"
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > Покинуть текущую гильдию"
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
 
@@ -3611,427 +3671,427 @@ msgstr "Хранилище"
 msgid "Cart"
 msgstr "Телега"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr "О�новные клавиши"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Движение вверх"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Движение вниз"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Движение влево"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Движение вправо"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Прицел и атака"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "Движение к цели"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "Изменение типа движени� и атаки"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr "Переход к Домашней локации"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr "У�тановка Домашней локации"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr "Движение к навигационной точке"
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "О�тановка атаки"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr "�н�ть выделение"
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "Выбор ближнего мон�тра"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Выбор NPC"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Выбор игрока"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Подн�тие предметов"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "Изменение типа подбора предметов"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Скрытие окон"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "При�едание/В�тавание"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Создание �криншота"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Разрешение/Запрет торговли"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "Изменение режима отображени� карты"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "Выбор Ok"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr "Клавиши бы�трых дей�твий"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr "Гор�чие клавиши предметов"
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Комбинаци� клавиш бы�трого предмета %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr "Клавиши окон"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Окно помощи"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Окно �тату�а"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Окно инвентар�"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Окно �кипировки"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Окно навыков"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Окно мини-карты"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Окно чата"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Окно бы�трого и�пользовани� предметов"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Окно на�троек"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Окно отладки"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "Окно обще�тва"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Окно �моций"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "Окно нар�дов"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr "Окно магазина"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr "Окно бы�трого бро�ани� предметов"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr "Окно �тати�тики атак"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr "Окно команд"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr "Окно детектора ботов"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "Окно кто онлайн"
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "Окно \"Вы знаете?\""
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr "Предыдуща� закладка обще�тва"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr "Следующа� закладка обще�тва"
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr "Клавиши �майлов"
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "Смайлы"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Комбинаци� клавиш дл� �майла %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr "Клавиши нар�дов"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "�адеть нар�д"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr "Копировать нар�д"
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr "Копирование надетого нар�да"
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr "Клавиши чата"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Переключение на чат"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Прокручивание чата вверх"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Прокручивание чата вниз"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Предыдуща� закладка чата"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Следующа� закладка чата"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr "Закрыть текущую вкладку чата"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr "Предыдуща� �трока чата"
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr "Следующа� �трока чата"
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr "�втозавершение в чате"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr "Отключение фоку�а ввода"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr "Другие клавиши"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Игнорирование ввода 1"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Игнорирование ввода 2"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr "Повернуть�� вверх"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr "Повернуть�� вниз"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr "Повернуть�� влево"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr "Повернуть�� вправо"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr "Сума�шедшие движени�"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr "Помен�ть режим �ума�шедших движений"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr "Бы�трый �бро� N предметов из 0 �лота"
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr "Бы�трый �бро� N предметов"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr "Переключение �чётчика бы�трого �бро�а"
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "Бы�трое лечени� �еб� или цели"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr "И�пользование заклинани� #itenplz"
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "И�пользование магиче�кой атаки"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr "Переключение маг. атаки"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr "Переключение pvp атаки"
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr "Изменение типа движени�"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr "Измение типа атаки оружием"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr "Изменение типа атаки"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr "Изменение режима �ледовани�"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr "Изменение режима имитации"
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr "Включение / Выключение �пециальных модификаторов"
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "Вкл. / Выкл. звука"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "Включение / Выключение режима отошел"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr "Эмул�ци� правого клика � клавиатуры"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr "Изменение режима камеры"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr "Кнопка-модификатор"
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -4040,42 +4100,42 @@ msgstr ""
 "Конфликт клавиш \"%s\" и \"%s\".И�правьте их, или игра может �еб� �транно "
 "ве�ти."
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr "Ва� убил %s"
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка подн�ть не�уще�твующий предмет."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "Предмет �лишком т�желый."
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "Предмет �лишком далеко"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr "�еизве�тна� проблема при подн�тии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4083,398 +4143,398 @@ msgstr[0] "Вы подн�ли %d [@@%d|%s@@]."
 msgstr[1] "Вы подн�ли %d [@@%d|%s@@]."
 msgstr[2] "Вы подн�ли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1719
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
 msgstr "опыт"
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
 msgstr "работа"
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr "(D) движени� по умолчанию"
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда � �умашедшими движени�ми"
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение � �умашедшими движени�ми"
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и �умашедшие движени�"
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr "(?) неизве�тное движение"
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) �ума�шедшее движение %d"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr "(a) пользователь�кие �умашедшие движени�"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr "(?) неизве�тные �ума�шедшие движени�"
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на ра��то�ние 1"
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на ра��то�ние 2"
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на ра��то�ние 3"
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на ра��то�ние 5"
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на ра��то�ние 7"
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на ра��то�ние атаки"
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr "(a) атака лучника"
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?) неизве�тное движение к цели"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr "(D) �ледование по умолчанию"
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr "(R) отно�ительное �ледование"
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное �ледование"
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr "(P) �ледование как животное"
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr "(?) неизве�тное �ледование"
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) неизве�тна� атака"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr "(D) обычна� атака"
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки �о щитом"
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, �обирать"
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) подн�тие в обла�ти 1x1"
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) подн�тие из обла�ти 2x1"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) подн�тие из обла�ти �переди 2x3"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) подн�тие из обла�ти 3x3"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и подн�тие на ра��то�нии 4"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и подн�тие на ра��то�нии 8"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и подн�тие на мак�имальном ра��то�нии"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?) неизве�тный режим подн�ти�"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr "(u) �пециальный режим карты"
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr "(U) �пециальный режим карты 2"
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr "(e) режим пу�той карты"
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr "(f) и�пользовать #flar дл� атаки"
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) и�пользовать #chiza дл� атаки"
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) и�пользовать #ingrav дл� атаки"
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) и�пользовать #frillyar дл� атаки"
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) и�пользовать #upmarmu дл� атаки"
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr "(?) неизве�тна� магиче�ка� атака"
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr "(a) атаковать в�ех игроков"
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
 msgstr "(f) атаковать в�ех кроме друзей"
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr "(b) атаковать врагов"
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
 msgstr "(d) не атаковать игроков"
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr "(?) pvp атака"
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr "(D) имитаци� по умолчанию"
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr "(O) имитаци� нар�дов"
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr "(?) неизве�тна� имитаци�"
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr "(A) отошел"
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr "(?) неизве�тный режим отошел"
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr "(G) игрова� камера"
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr "(F) �вободна� камера"
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr "Игровые модификаторы в неизве�тном положении"
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr "Имитаци�: "
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr "Имитаци� отменена"
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr "Вы видите "
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [параметры] [файл-manaplus]"
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[файл-manaplus] : Файл manaplus �то xml файл (.manaplus)"
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr "                  и�пользует�� дл� указани� дополнительных параметров"
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr "                  в клиенте."
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Опции:"
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : И�пользовать указанный файл как лог"
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : И�пользовать указанный каталог дл� лога"
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Показать вер�ию"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Показать �ту �правку"
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : И�пользовать указанный каталог конфигурации"
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Войти � указанным логином"
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Войти � указанным паролем"
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : И�пользовать указанный пер�онаж"
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Им� или IP �ервера авторизации"
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Порт �ервера авторизации"
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : И�пользовать �тот узел обновлений"
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Выбрать пер�онаж и �ервер пер�онажей по умолчанию"
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Пропу�тить обновление"
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Загрузить игровые данные из �того каталога"
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Каталог дл� локальных данных"
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Сохран�ть �криншоты в указанном каталоге"
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Запу�к игры в безопа�ном режиме"
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Запу�кает проверку драйверов и автоконфигурацию"
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : �е и�пользовать OpenGL дл� �той �е��ии"
 
@@ -4712,44 +4772,44 @@ msgstr "Вы были кикнуты из гильдии."
 msgid "%s has kicked from your guild."
 msgstr "%s был вышвырнут из Вашей гильдии."
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > Пригла�ить игрока в Вашу группу"
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Покинуть текущую группу"
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 "/item > Показать/Скрыть текущее �о�то�ние ра�пределени� предметов в группе"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > Показать/Скрыть текущее �о�то�ние ра�пределени� опыта в группе"
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr "Эта команда приглашает <им� пер�онажа> к вам в группу."
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr "Эта команда за�тавл�ет игрока покинуть группу"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr "Команда: /item <политика разделени� предметов>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr "Команда измен�ет политику разделени� предетов между ченами группы."
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4757,23 +4817,23 @@ msgstr ""
 "<политикой> может быть \"1\", \"yes\", \"true\" дл� включени� разделени� или "
 "\"0\", \"no\", \"false\" -- дл� выключени�."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr "Команда: /item"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr "Отображает текущую политику разделени� предметов между членами группы."
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr "Команда: /exp <политика ра�пределени� опыта>"
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr "Эта команда измен�ет политику ра�пределени� опыта в группе."
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -4781,43 +4841,43 @@ msgstr ""
 "<policy> может быть одним из \"1\", \"yes\", \"true\" - чтобы разрешить "
 "общий опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr "Команда: /exp"
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr "Эта команда отображает текущую политику обмена опытом."
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "Обмен предметами включен"
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "Обмен предметами выключен"
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "Обмен предметами невозможен."
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr "Стату� обмена предметами неизве�тен."
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "Обмен опытом вклыючен."
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "Обмен опытом выкючен."
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr "Обмен опытом невозможен."
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr "Политика ра�пределени� опыта неизве�тна."
 
@@ -4893,83 +4953,83 @@ msgstr "Это им� пользовател� уже зан�то."
 msgid "Username permanently erased."
 msgstr "Пользователь удален"
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "�е удало�ь �оздать группу."
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "Группа у�пешно �оздана."
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s при�оединил�� к группе."
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s уже в Вашей группе."
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s отверг Ваше приглашение."
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s теперь в Вашей группе."
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s не может при�оединить�� к Вашей группе, т.к. группа переполнена."
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr "QQQ �еизве�тный ответ на приглашение дл� %s"
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "Вы покинули группу."
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s покинул Вашу группу."
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "�еизве�тный уча�тник попытал�� �казать: %s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Вы мертвы."
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "С гру�тью �ообщаем вам, что Ваш пер�онаж пал в бою."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Ва� больше нет �реди живых."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "Холодные руки Смерти извлекают Вашу душу."
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Игра Окончена!"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "Опу�тите монетку дл� продолжени�."
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -4977,78 +5037,78 @@ msgstr ""
 "�ет, детки. Ваш пер�онаж на �амом деле не умер. Он...�ммм...ушел в лучший "
 "мир."
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "Ваш план �ломать оружие врагов о �вое горло провалил��."
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Похоже, �то было не �лишком хорошо."
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Хочешь, пред�кажу твою �удьбу?"
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Гру�тно, Ва� вр�д ли когда-нибудь найдут..."
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Уничтожен."
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Похоже, Вам отдали Вашу голову."
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Вы оп�ть пролетели, выбро�ите �воё тело в трубу, и получите другое."
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "Вы не мертвы. Вы про�то отдыхаете."
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr "Ва� больше нет."
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr "Вы пере�тали быть."
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr "Ваше врем� и�текло, пора в�третить�� � Создателем."
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr "Вы �дули�ь."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr "Лишенный жизни, покой�� � миром."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Е�ли бы Вы не были нари�ованными, Вы бы отправли�ь на тот �вет"
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr "Ваш обмен веще�тв �тал и�торией."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr "Вы упали � ветки."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr "Вы прот�нули ноги."
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -5056,27 +5116,27 @@ msgstr ""
 "Вы зата�кали �вою �мертную оболочку, �орвали занаве� и незримо "
 "при�оединили�ь к кровоточащему хору..."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr "Вы не жилец."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr "Ва� пришпиливают к фьордам."
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "Сообщение"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Вы не�ете груз больший, чем половина вашей грузоподъемно�ти. Здоровье "
 "во��танавливать�� не будет."
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 "Ве� предметов �о�тавл�ет менее половины допу�тимого. Теперь Вы можете "
@@ -5668,24 +5728,24 @@ msgstr "�е удало�ь найти хо�т \""
 msgid "Connection to server terminated. "
 msgstr "Подключение к �ерверу прервано."
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s не в группе!"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr "Печатать '...'"
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr "Мигать именем"
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr "Плавающий '...' пузырек"
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr "Плавающий пузырек"
 
diff --git a/po/sk.po b/po/sk.po
index 1b29e9bca..db6270827 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,220 +18,244 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Nastavenie"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Chyba"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Neznámy príkaz."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -238,7 +263,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -246,7 +271,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -254,7 +279,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -262,7 +287,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -270,92 +295,92 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -364,23 +389,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -388,79 +414,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Kúpiť"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Ukon�iť"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Obchod"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Predaj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -496,7 +526,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Heslo:"
@@ -523,81 +553,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "Vytvoriť postavu"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Meno"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Muž"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Žena"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Prosím rozdeľ %d bodov"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tvoje meno musí mať aspoň 4 písmená."
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Charakterové staty OK"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Prosím odstráň %d bodov"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "Potvr�te zmazanie postavy"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "Naozaj chcete odstrániť túto postavu?"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "Ú�et a správa postáv"
 
@@ -605,120 +640,122 @@ msgstr "Ú�et a správa postáv"
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Zrušiť registráciu"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Vymazať"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Nápoveda pre %s: %s"
@@ -731,363 +768,409 @@ msgstr "�no"
 msgid "No"
 msgstr "Nie"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvoriť"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Potvrdiť"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Vybavenie"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Odstrojiť"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Nápoveda"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
-msgstr "Inventár"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr "Inventár"
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Vystrojiť"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Použiť"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Zahodiť"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Zvoľte množstvo vecí k predaju."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Zvoľte množstvo vecí k zahodeniu."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Zvoľte množstvo vecí k rozdeleniu."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
@@ -1095,7 +1178,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
@@ -1103,138 +1186,137 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Prihlásenie"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrovať"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Nasledujúci"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1247,345 +1329,382 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Zmeniť server"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Vymeniť postavu"
 
@@ -1629,200 +1748,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Sfx zvuk"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Hudobný zvuk"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1870,40 +2028,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Použiť"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1926,360 +2084,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr ""
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2295,408 +2553,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Schopnosti"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2704,502 +2995,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Level: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3223,26 +3151,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3250,33 +3178,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "Meno: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Pripájam sa..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3428,23 +3356,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3509,7 +3437,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Ak <nick> medzery v mene, použi dvojité úvodzovky (\")."
 
@@ -3547,6 +3476,41 @@ msgstr "Globálne oznámenie od %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3676,438 +3640,477 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4115,119 +4118,396 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4243,142 +4523,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4412,418 +4680,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4837,160 +5101,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -4999,7 +5263,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -5008,7 +5272,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5017,7 +5281,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5026,7 +5290,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5296,41 +5560,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5338,129 +5602,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/sq.po b/po/sq.po
index b70f85508..773851705 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,340 +18,364 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Unknown command > Komand e panjohur"
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -359,23 +384,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -383,79 +409,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr ""
 
@@ -491,7 +521,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr ""
@@ -518,81 +548,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr ""
 
@@ -600,120 +635,122 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -726,508 +763,553 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1240,345 +1322,382 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -1622,200 +1741,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:64
-msgid "Sfx volume"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:65
-msgid "Music volume"
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1863,40 +2021,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1919,360 +2077,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr ""
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2288,408 +2546,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2697,502 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3216,26 +3144,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3243,33 +3171,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3421,23 +3349,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3502,7 +3430,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3540,6 +3469,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3669,557 +3633,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4235,142 +4515,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4404,418 +4672,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4829,160 +5093,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -4991,7 +5255,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -5000,7 +5264,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5009,7 +5273,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5018,7 +5282,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5288,41 +5552,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5330,129 +5594,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/sv.po b/po/sv.po
index 879bc828a..509316aa7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,342 +18,364 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Inställningar"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr "Video"
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Fel"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Okänt kommando."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "Behöver en text att viska!"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, 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."
+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/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Skickar förfrågan att gå in i chattkanalen %s."
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "Du måste ange gruppens namn."
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "Retur visar/döljer chattfönstret."
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Meddelande stänger chattfönstret."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "Retur växlar nu chattfönstrets synlighet."
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "Meddelanden stänger nu chattfönstret."
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Alternativ till /%s är �yes�, �no�, �true�, �false�, �1�, �0�."
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Allmänt"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Kunde inte spara skärmbild!"
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Nätverksfel"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorerar handelserbjudanden"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Accepterar handelserbjudanden"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "Kunde inte ladda %s"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -361,23 +384,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Namn"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Attackera"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "Prata"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -385,79 +409,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Återställ"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Köp"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Pris: %s / Totalt: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "Max"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "Affär"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Sälj"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -493,7 +521,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Ändra lösenord"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Lösenord:"
@@ -520,81 +548,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "Skapa karaktär"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Namn:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "Skapa"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Man"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Kvinna"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Var vänlig fördela %d poäng"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Karaktärens värden okej"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "Var vänlig ta bort %d poäng"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "Bekräfta borttagning av karaktär"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 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/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "Hantering av konto och karaktärer"
 
@@ -602,120 +635,122 @@ msgstr "Hantering av konto och karaktärer"
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Avregistrera"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Chatt"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
@@ -728,508 +763,553 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Karta"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Okej"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Utrustning"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "Avrusta"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
-msgstr "Inventarium"
-
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
-msgstr "Utrymme:"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr "Inventarium"
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
+msgstr "Utrymme:"
+
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Utrusta"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Använd"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Dela"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "Vikt:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Lagra"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Hämta"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "Släpp"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Alla"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "Välj antal föremål att handla med."
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Välj antal föremål att släppa."
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "Välj antal att lagra."
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "Välj antal att hämta."
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Välj antal föremål att dela."
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Användarnamn"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrera"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Väntar på server"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Nästa"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "Vidare"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Till:"
@@ -1240,349 +1320,384 @@ msgstr "Skicka"
 
 #: 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."
+msgstr "Kunde inte skicka brevet eftersom antingen avsändaren eller brevet självt är ogiltigt."
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Byteshandla"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "Spelare"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Byt server"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Byt karaktär"
 
@@ -1626,200 +1741,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr "Port:"
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Lägg till"
 
-#: src/gui/serverdialog.cpp:393
-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/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Ljud"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Ljud"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "Volym för ljudeffekter"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Musikvolym"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Färger"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "Visa alla viskningar i egna flikar"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "Så här ser färgen ut"
@@ -1867,41 +2021,41 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Verkställ"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "Återställ fönster"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "Klicka på knappen för att starta kalibreringen"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Kalibrera"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "Aktivera joystick"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "Rotera spaken"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1923,360 +2077,460 @@ msgstr "Förval"
 msgid "Key Conflict(s) Detected."
 msgstr "Samma tangent används på flera ställen."
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Monster"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "Spelare"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "Synliga namn"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "Relation"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "Neutral"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "Vän"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "Förbisedd"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "Ignorerad"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "Tillåt byteshandel"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "Tillåt viskningar"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "Vid ignorering:"
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Typsnittsgrad"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringen ska börja gälla."
 
@@ -2292,408 +2546,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Ingen text"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Text"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "Textbubblor utan namn"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "Textbubblor med namn"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "av"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "låg"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "hög"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "medium"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "maximal"
-
-#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Helskärm"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "Särskild muspekare"
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
-msgstr "Partikeleffekter"
-
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
-msgstr "Visa erhållna saker"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
-msgstr "i chattfönster"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
+msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
-msgstr "som partikel"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
+msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Video"
-
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
-msgstr "Text ovanför huvudet"
-
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
-msgstr "Genomskinlighet"
-
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr "Omgivande FX"
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart krävs för att ändringarna ska synas."
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "Ändringar i OpenGL kräver omstart."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Genomskinlighet"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Ingen text"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Text"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "Textbubblor utan namn"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "Textbubblor med namn"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "Text ovanför huvudet"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "av"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "låg"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "hög"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "Omgivande FX"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "Partikeleffekter"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "medium"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "maximal"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-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/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr "Lägg till"
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "Förfrågan om byteshandel"
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Färdigheter"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr "Upp"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Gille"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Grupp"
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Skapa gille"
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "Mottog en gruppinbjudan, men du har redan en annan inbjudan."
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig till sin grupp."
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig till %ss grupp."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "Acceptera gruppinbjudan"
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2701,502 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Nivå: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "Pengar: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "EP:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "Jobb: %d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Jobb:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3220,62 +3144,60 @@ msgstr "Godkänt. Väntar…"
 msgid "Trade: You"
 msgstr "Byteshandel: du"
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr "Du ger:"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "Ändra"
 
-#: src/gui/tradewindow.cpp:332
-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/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:375
 msgid "You don't have enough money."
 msgstr "Du har inte tillräckligt med pengar."
 
+#: src/gui/tradewindow.cpp:454
+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/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Namn: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Uppdaterar..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "Spela"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  Uppdateringsprocessen är inte avslutad."
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Det rekommenderar verkligen att"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Färdig"
 
@@ -3427,23 +3349,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3453,9 +3375,7 @@ msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
-msgstr ""
-"/users > Visar en lista över de spelare som finns i den aktuella "
-"chattkanalen"
+msgstr "/users > Visar en lista över de spelare som finns i den aktuella chattkanalen"
 
 #: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
@@ -3510,17 +3430,14 @@ msgid "This command makes <nick> a channel operator."
 msgstr "Det här kommandot gör <spelare> till chattkanalsoperatör."
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Om <spelare> innehåller mellanslag, måste du sätta citattecken (\") runt "
-"det."
+msgstr "Om <spelare> innehåller mellanslag, måste du sätta citattecken (\") runt det."
 
 #: src/gui/widgets/channeltab.cpp:87
 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."
+msgstr "Operatörer kan sparka ut och ge operatörsstatus till andra spelare i chattkanalen."
 
 #: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
@@ -3552,6 +3469,41 @@ msgstr "Globalt meddelande från %s:"
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3681,557 +3633,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Gå uppåt"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Gå nedåt"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Gå åt vänster"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Gå åt höger"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "Välj & attackera"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "Smiley"
-
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "Sluta attackera"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "Välj NPC"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Välj spelare"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "Plocka upp"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "Dölj fönster"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "Sitt"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Skärmbild"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "Tillåt/neka handel"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr "Välj okej"
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Tangent för snabbåtkomst %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "Hjälpfönster"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Statusfönster"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "Inventorium"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "Utrustningsfönster"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "Färdighetsfönster"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "Minikarta"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Chattfönster"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "Snabbåtkomstfönster"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "Inställningsfönster"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "Smileyfönster"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr "Smiley"
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Tangent för smiley %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "Växla chattfönster"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "Rulla upp chatt"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "Rulla ned chatt"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "Föregående chattflik"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "Nästa chattflik"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "Välj okej"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "Ignorera inmatning 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "Ignorera inmatning 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "Alternativ:"
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4247,142 +4515,130 @@ msgstr "Tack för köpet."
 msgid "Unable to buy."
 msgstr "Kan inte köpa."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "Information"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4416,425 +4672,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "Du är död."
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 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."
+msgstr "Vi beklagar att behöva meddela dig om att din karaktär dödades i strid."
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "Du är inte så värst levande längre."
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 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/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "Spelet är slut!"
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 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."
+msgstr "Barn, barn. Din karaktär dog egentligen inte. Den… öh… kom till ett bättre ställe."
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 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."
+msgstr "Din plan att ha sönder dina fiendens vapen genom att krossa dem med din hals misslyckades."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "Jag antar att det kunde gått bättre."
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "Vill du att dina tillhörigheter ska identifieras?"
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Ledsamt nog så kunde inga spår efter dig någonsin hittas…"
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "Tillintetgjord."
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "Verkar som att som att någon gav dig ditt huvud."
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 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."
+msgstr "Du klantade till det igen, släng din kropp vid kloakerna och skaffa dig en ny."
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4848,160 +5093,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s vill byteshandla med dig, accepterar du?"
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "Byteshandel avbruten."
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "Byteshandel genomförd."
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Styrka"
 
@@ -5010,7 +5255,7 @@ msgstr "Styrka"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Smidighet"
 
@@ -5019,7 +5264,7 @@ msgstr "Smidighet"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Skicklighet"
 
@@ -5028,7 +5273,7 @@ msgstr "Skicklighet"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "Hälsa"
 
@@ -5037,7 +5282,7 @@ msgstr "Hälsa"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Intelligens"
 
@@ -5307,41 +5552,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr "Styrka %+d"
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr "Smidighet %+d"
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr "Livskraft %+d"
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligens %+d"
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Skicklighet %+d"
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr "Tur %+d"
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5349,129 +5594,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr "Kopplades från servern!"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Tur"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s är inte med i din grupp!"
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "namnlös"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "Attack %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "Försvar %+d"
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "Hälsa %+d"
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "Mana %+d"
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "Okänt föremål"
-
-
diff --git a/po/sv_SE.po b/po/sv_SE.po
new file mode 100644
index 000000000..2d5e15cbc
--- /dev/null
+++ b/po/sv_SE.po
@@ -0,0 +1,5723 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.net/projects/p/manaplus/language/sv_SE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv_SE\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/actorspritemanager.cpp:1168
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:560
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+msgid "Setup"
+msgstr ""
+
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
+msgid "Connecting to server"
+msgstr ""
+
+#: src/client.cpp:1104
+msgid "Logging in"
+msgstr ""
+
+#: src/client.cpp:1138
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:1242
+msgid "Requesting characters"
+msgstr ""
+
+#: src/client.cpp:1277
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:1287
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
+msgid "Error"
+msgstr ""
+
+#: src/client.cpp:1348
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:1374
+msgid "Password Change"
+msgstr ""
+
+#: src/client.cpp:1375
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:1394
+msgid "Email Change"
+msgstr ""
+
+#: src/client.cpp:1395
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:1415
+msgid "Unregister Successful"
+msgstr ""
+
+#: src/client.cpp:1416
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1821
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1855 src/client.cpp:1861
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/client.cpp:1882
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:215
+msgid "Unknown command."
+msgstr ""
+
+#: src/commandhandler.cpp:335
+msgid "Cannot send empty whispers!"
+msgstr ""
+
+#: src/commandhandler.cpp:349
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
+msgstr ""
+
+#: src/commandhandler.cpp:369
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:396
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:460
+msgid "Return toggles chat."
+msgstr ""
+
+#: src/commandhandler.cpp:460
+msgid "Message closes chat."
+msgstr ""
+
+#: src/commandhandler.cpp:471
+msgid "Return now toggles chat."
+msgstr ""
+
+#: src/commandhandler.cpp:477
+msgid "Message now closes chat."
+msgstr ""
+
+#: src/commandhandler.cpp:505
+msgid "friend"
+msgstr ""
+
+#: src/commandhandler.cpp:510
+msgid "disregarded"
+msgstr ""
+
+#: src/commandhandler.cpp:515
+msgid "neutral"
+msgstr ""
+
+#: src/commandhandler.cpp:534
+#, c-format
+msgid "Player already %s!"
+msgstr ""
+
+#: src/commandhandler.cpp:548
+#, c-format
+msgid "Player successfully %s!"
+msgstr ""
+
+#: src/commandhandler.cpp:556
+#, c-format
+msgid "Player could not be %s!"
+msgstr ""
+
+#: src/commandhandler.cpp:579
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:586
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:588
+msgid "Player could not be unignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
+msgid "Player already erased!"
+msgstr ""
+
+#: src/commandhandler.cpp:625
+msgid "Player successfully erased!"
+msgstr ""
+
+#: src/commandhandler.cpp:627
+msgid "Player could not be erased!"
+msgstr ""
+
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
+#, c-format
+msgid "Client uptime: %s"
+msgstr ""
+
+#: src/commandhandler.cpp:950
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:959
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:967
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:975
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:983
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1062
+msgid "font cache size"
+msgstr ""
+
+#: src/commandhandler.cpp:1074
+msgid "Cache size:"
+msgstr ""
+
+#: src/commandhandler.cpp:1078
+msgid "Created:"
+msgstr ""
+
+#: src/commandhandler.cpp:1080
+msgid "Deleted:"
+msgstr ""
+
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
+msgid "Resource images:"
+msgstr ""
+
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
+msgid "Resource orphaned images:"
+msgstr ""
+
+#: src/commandhandler.h:34
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+msgid "General"
+msgstr ""
+
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+msgid "Debug"
+msgstr ""
+
+#: src/game.cpp:512
+msgid "Screenshot saved as "
+msgstr ""
+
+#: src/game.cpp:520
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: src/game.cpp:562
+msgid "The connection to the server was lost."
+msgstr ""
+
+#: src/game.cpp:563
+msgid "Network Error"
+msgstr ""
+
+#: src/game.cpp:1275
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/game.cpp:1285
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: src/game.cpp:1799
+msgid "Could Not Load Map"
+msgstr ""
+
+#: src/game.cpp:1800
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:124
+#, c-format
+msgid "Party: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:138
+#, c-format
+msgid "Guild: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:151
+#, c-format
+msgid "Pvp rank: %d"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:162
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+msgid "Name"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
+msgid "Attack"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
+msgid "Talk"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
+msgid "Move"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
+msgid "Reset"
+msgstr ""
+
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+msgid "Buy"
+msgstr ""
+
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr ""
+
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
+msgid "+"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
+msgid "-"
+msgstr ""
+
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
+msgid "Quit"
+msgstr ""
+
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
+msgid "Max"
+msgstr ""
+
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:93
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:54
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:146
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
+msgid "Change Password"
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
+msgid "Password:"
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:66
+msgid "Type new password twice:"
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:114
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:134
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
+msgid "Name:"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:106
+msgid "Hair color:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:110
+msgid "Hair style:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
+msgid "Race:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
+msgid "Create"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
+msgid "Male"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
+msgid "Female"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
+#, c-format
+msgid "Please distribute %d points"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:273
+msgid "Your name needs to be at least 4 characters."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:359
+msgid "Character stats OK"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:373
+#, c-format
+msgid "Please remove %d points"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:76
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:77
+msgid "Are you sure you want to delete this character?"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:125
+msgid "Account and Character Management"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:139
+msgid "Switch Login"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
+msgid "Unregister"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:163
+msgid "Change Email"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:256
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:289
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:289
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
+msgid "Delete"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:471
+msgid "Choose"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:474
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
+msgid "(empty)"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:126
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:127
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:128
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:129
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
+msgid "???"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
+msgid "Chat"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:654
+#, c-format
+msgid "Present: %s; %d players are present."
+msgstr ""
+
+#: src/gui/chatwindow.cpp:1041
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/confirmdialog.cpp:47
+msgid "Yes"
+msgstr ""
+
+#: src/gui/confirmdialog.cpp:48
+msgid "No"
+msgstr ""
+
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
+msgid "Ignore"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
+msgid "Map"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:73
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:74
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
+#, c-format
+msgid "%d FPS (Software)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:168
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:171
+#, c-format
+msgid "%d FPS (old OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:178
+#, c-format
+msgid "%d FPS"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:233
+#, c-format
+msgid "Particle count: %d"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
+msgid "Target Id:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
+#, c-format
+msgid "Ping: %s ms"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:400
+#, c-format
+msgid "In: %d bytes/s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:402
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:48
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
+msgid "Close"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:65
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:66
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:67
+msgid "Auto open this window"
+msgstr ""
+
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/helpwindow.cpp:44
+msgid "Help"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
+msgid "Equip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
+msgid "Use"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
+msgid "Drop..."
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
+msgid "Split"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:178
+msgid "Weight:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:208
+msgid "All"
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:259
+msgid "Select amount of items to trade."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:262
+msgid "Select amount of items to drop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:265
+msgid "Select amount of items to store."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:268
+msgid "Select amount of items to retrieve."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:271
+msgid "Select amount of items to split."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:274
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:277
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:280
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:193
+#, c-format
+msgid "Weight: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:66
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:67
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:363
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:369
+msgid "jacko spawning"
+msgstr ""
+
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
+msgid "Login"
+msgstr ""
+
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:98
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:112
+msgid "Remember username"
+msgstr ""
+
+#: src/gui/logindialog.cpp:113
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
+msgid "Register"
+msgstr ""
+
+#: src/gui/logindialog.cpp:124
+msgid "Change Server"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:92
+msgid "weight bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
+msgid "Next"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:55
+msgid "Submit"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
+msgid "NPC"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
+msgid "Clear"
+msgstr ""
+
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
+msgstr ""
+
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
+msgstr ""
+
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
+#, c-format
+msgid "Key: %s"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:91
+msgid "Unequip first"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:94
+msgid "Away outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
+msgid "Whisper"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
+msgid "Heal"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
+msgid "Kick from guild"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
+msgid "Change pos in guild"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
+msgid "Invite to guild"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:266
+msgid "Kick player"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:268
+msgid "Nuke"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:313
+msgid "Kick"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:324
+msgid "Remove from attack list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:329
+msgid "Add to priority attack list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:331
+msgid "Add to attack list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:333
+msgid "Add to ignore list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
+msgid "Add name to chat"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
+msgid "Pick up"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
+msgid "Add to chat"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:567
+msgid "Map Item"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:568
+msgid "Rename"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
+msgid "Remove"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
+msgid "Spells"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:610
+msgid "Load old spells"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:611
+msgid "Edit spell"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:637
+msgid "Disable highlight"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:639
+msgid "Enable highlight"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:643
+msgid "Remove name"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:645
+msgid "Enable away"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:647
+msgid "Disable away"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
+msgid "Leave"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
+msgid "Change guild position"
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1336
+msgid "Rename map sign          "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1338
+msgid "Name:                    "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1383
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1385
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1787
+msgid "Add to trade"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1791
+msgid "Add to trade 10"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1792
+msgid "Add to trade half"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1793
+msgid "Add to trade all"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1803
+msgid "Store 10"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1804
+msgid "Store half"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1805
+msgid "Store all"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
+msgid "Drop all"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1844
+msgid "Retrieve 10"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1845
+msgid "Retrieve half"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1846
+msgid "Retrieve all"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
+msgid "Load old item shortcuts"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1984
+msgid "Load old drop shortcuts"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
+msgid "Hide"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
+msgid "Show"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2061
+msgid "Reset yellow bar"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
+msgid "Copy to chat"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
+msgid "(default)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
+msgid "Move up"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
+msgid "Move down"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:52
+msgid "Switch server"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:53
+msgid "Switch character"
+msgstr ""
+
+#: src/gui/register.cpp:77
+msgid "Confirm:"
+msgstr ""
+
+#: src/gui/register.cpp:108
+msgid "Email:"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:228
+msgid "Choose Your Server"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:243
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:263
+msgid "Connect"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:444
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:449
+msgid "Waiting for server..."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:453
+msgid "Preparing download"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:457
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:548
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:59
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:63
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:65
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:69
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:71
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:74
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:78
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:80
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:83
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:87
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:89
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:93
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:95
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:98
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:101
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:104
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:107
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:110
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:113
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:119
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
+msgid "This is what the color looks like"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:75
+msgid "Type:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
+msgid "Static"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
+msgid "Pulse"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
+msgid "Rainbow"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
+msgid "Spectrum"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
+msgid "Delay:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:112
+msgid "Red:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:127
+msgid "Green:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:142
+msgid "Blue:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:75
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
+msgid "Calibrate"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:47
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:122
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:80
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:89
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
+msgid "Default"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:133
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_other.cpp:38
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:49
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:52
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:56
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:59
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:65
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:68
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:71
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:74
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:77
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:80
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:83
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:98
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:101
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:111
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:113
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:116
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:119
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:122
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:125
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:128
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:131
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:134
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:137
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:143
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:146
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:152
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:170
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
+
+#: src/gui/setup_other.cpp:177
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:180
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:183
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:186
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:54
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:57
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:60
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:63
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:66
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:69
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:72
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:82
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:85
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:88
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:56
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:68
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:71
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:74
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:77
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:71
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:72
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:73
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:74
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:75
+msgid "Erased"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:245
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:248
+msgid "Old"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:250
+msgid "Relations"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:272
+msgid "When ignoring:"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:82
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:83
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:84
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:86
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:87
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:167
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:170
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:171
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:172
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:173
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:352
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
+msgstr ""
+
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
+msgstr ""
+
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr ""
+
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr ""
+
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
+msgstr ""
+
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
+
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:120
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:128
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:762
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
+msgid "Skills"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:288
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:341
+#, c-format
+msgid "Skill points available: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
+#, c-format
+msgid "Skill Set %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:432
+#, c-format
+msgid "Skill %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:546
+#, c-format
+msgid "Lvl: %d (%+d)"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
+msgid "Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:174
+#, c-format
+msgid "Invited user %s to guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:188
+#, c-format
+msgid "Guild %s quit requested."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:215
+msgid "Member Invite to Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:216
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:225
+msgid "Leave Guild?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:226
+#, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:374
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:388
+#, c-format
+msgid "Party %s quit requested."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:415
+msgid "Member Invite to Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:416
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:425
+msgid "Leave Party?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:426
+#, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:650
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:928
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:969
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1001
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1036
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1196
+msgid "Create Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
+msgid "Create Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+msgid "Social"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1262
+msgid "Invite"
+msgstr ""
+
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1425
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1442
+#, c-format
+msgid "Accepted guild invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1455
+#, c-format
+msgid "Rejected guild invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1502
+#, c-format
+msgid "Creating guild called %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1525
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1539
+msgid "Guild Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1540
+msgid "Choose your guild's name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1554
+msgid "Received guild request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1560
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1566
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1581
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1592
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1596
+#, c-format
+msgid "You have been invited to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1604
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1609
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1618
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1633
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1638
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1639
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+msgid "Specials"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
+#, c-format
+msgid "Level: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:157
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:164
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:178
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:211
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
+#, c-format
+msgid "Character points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:275
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:331
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:112
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:119
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:167
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:184
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:188
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:193
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:196
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:208
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:214
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:220
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:226
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:232
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:237
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
+msgid "Propose trade"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:61
+msgid "Confirmed. Waiting..."
+msgstr ""
+
+#: src/gui/tradewindow.cpp:62
+msgid "Agree trade"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:63
+msgid "Agreed. Waiting..."
+msgstr ""
+
+#: src/gui/tradewindow.cpp:66
+msgid "Trade: You"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
+#, c-format
+msgid "You get %s"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:112
+msgid "You give:"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:116
+msgid "Change"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
+msgstr ""
+
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/unregisterdialog.cpp:54
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:140
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:167
+msgid "Connecting..."
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:170
+msgid "Play"
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:571
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updaterwindow.cpp:573
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updaterwindow.cpp:575
+msgid "##1  you try again later."
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:751
+msgid "Completed"
+msgstr ""
+
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:103
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:197
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:631
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:670
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/users > Lists the users in the current channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/topic > Set the topic of the current channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:54
+msgid "/quit > Leave a channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:55
+msgid "/op > Make a user a channel operator"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:56
+msgid "/kick > Kick a user from the channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:66
+msgid "Command: /users"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:67
+msgid "This command shows the users in this channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:71
+msgid "Command: /topic <message>"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:72
+msgid "This command sets the topic to <message>."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:76
+msgid "Command: /quit"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:77
+msgid "This command leaves the current channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:78
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:83
+msgid "Command: /op <nick>"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:84
+msgid "This command makes <nick> a channel operator."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
+msgid "Channel operators can kick and op other users from the channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:92
+msgid "Command: /kick <nick>"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:93
+msgid "This command makes <nick> leave the channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:118
+msgid "Need a user to op!"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:125
+msgid "Need a user to kick!"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:151
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:157
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:184
+#, c-format
+msgid "%s whispers: %s"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:107
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:108
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:109
+msgid "/close > Close the whisper tab"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:119
+msgid "Command: /close"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:120
+msgid "This command closes the current whisper tab."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:124
+msgid "Command: /ignore"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:125
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "Status"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Select World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:82
+msgid "Change Login"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:83
+msgid "Choose World"
+msgstr ""
+
+#: src/inventory.cpp:251
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:253
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
+msgid "Move Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:47
+msgid "Move Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:48
+msgid "Move Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:49
+msgid "Move Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:52
+msgid "Target & Attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:54
+msgid "Move to Target"
+msgstr ""
+
+#: src/keyboardconfig.cpp:56
+msgid "Change Move to Target type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:58
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:60
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:62
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
+msgid "Target Closest"
+msgstr ""
+
+#: src/keyboardconfig.cpp:70
+msgid "Target NPC"
+msgstr ""
+
+#: src/keyboardconfig.cpp:71
+msgid "Target Player"
+msgstr ""
+
+#: src/keyboardconfig.cpp:73
+msgid "Pickup"
+msgstr ""
+
+#: src/keyboardconfig.cpp:74
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:76
+msgid "Hide Windows"
+msgstr ""
+
+#: src/keyboardconfig.cpp:78
+msgid "Sit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:79
+msgid "Screenshot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:80
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82
+msgid "Change Map View Mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
+msgid "Help Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:133
+msgid "Status Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:135
+msgid "Inventory Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:137
+msgid "Equipment Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:139
+msgid "Skill Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:141
+msgid "Minimap Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:143
+msgid "Chat Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:145
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:147
+msgid "Setup Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:149
+msgid "Debug Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:151
+msgid "Social Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:153
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:155
+msgid "Outfits Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:157
+msgid "Shop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:163
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:165
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:170
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:173
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:175
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:283
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:285
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
+msgid "Toggle Chat"
+msgstr ""
+
+#: src/keyboardconfig.cpp:290
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:292
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:294
+msgid "Previous Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Next Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:310
+msgid "Ignore input 1"
+msgstr ""
+
+#: src/keyboardconfig.cpp:312
+msgid "Ignore input 2"
+msgstr ""
+
+#: src/keyboardconfig.cpp:314
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:318
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:320
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:322
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:324
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:326
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:328
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:332
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:334
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:336
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:342
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:344
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:346
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:348
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:351
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:352
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:354
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:356
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:358
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:360
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:439
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
+msgstr ""
+
+#: src/localplayer.cpp:1436
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1439
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1442
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1445
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1448
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1451
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1454
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1478
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
+msgid "Away"
+msgstr ""
+
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
+msgid "Follow: "
+msgstr ""
+
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
+msgid "Follow canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3792
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:4150
+msgid "You see "
+msgstr ""
+
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
+msgstr ""
+
+#: src/main.cpp:61
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:62
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#: src/main.cpp:63
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:64
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:65
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#: src/main.cpp:66
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#: src/main.cpp:67
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#: src/main.cpp:68
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#: src/main.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#: src/main.cpp:70
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#: src/main.cpp:71
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#: src/main.cpp:72
+msgid "     --update-host    : Use this update host"
+msgstr ""
+
+#: src/main.cpp:73
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#: src/main.cpp:75
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:76
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#: src/main.cpp:78
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#: src/main.cpp:80
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#: src/main.cpp:81
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
+msgstr ""
+
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
+msgstr ""
+
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Strength:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Agility:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Vitality:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:69
+msgid "Intelligence:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:70
+msgid "Dexterity:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:71
+msgid "Luck:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:115
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:119
+msgid "Cannot use this ID."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:122
+msgid "Unknown char-server failure."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:158
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:161
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:164
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182
+msgid "Character deleted."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:188
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:129
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:137
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:346
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:350
+msgid "MVP player: "
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
+msgid "Guild name: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:185
+#, c-format
+msgid "Online members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:187
+#, c-format
+msgid "Max members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:189
+#, c-format
+msgid "Average level: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:191
+#, c-format
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:412
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:416
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:420
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:424
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:428
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:464
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:512
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:75
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:85
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:92
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:96
+msgid "Command: /item <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:99
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "Command: /item"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:103
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "Command: /exp <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:109
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:111
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "Command: /exp"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:115
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:158
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:197
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:404
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:572
+msgid "Unable to equip."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:132
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:138
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Unregistered ID."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid "Wrong password."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:220
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:223
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:226
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:230
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:233
+#, 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/ea/loginhandler.cpp:240
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:243
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:249
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:81
+msgid "Could not create party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:83
+msgid "Party successfully created."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:139
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:175
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:180
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:185
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:190
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:195
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:359
+msgid "You have left the party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:372
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:449
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
+msgid "You are dead."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:103
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You are no more."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You have ceased to be."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:130
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:133
+msgid "You are an ex-player."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:134
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
+msgid "Message"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:453
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:459
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:505
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:623
+msgid "Equip arrows first."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:143
+msgid "Trade failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:146
+msgid "Emote failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Sit failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Could not join party!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:171
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:174
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:180
+msgid "You have no memos!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:183
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:186
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:189
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:199
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:202
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:213
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:216
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:219
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:135
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:242
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:247
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:251
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:338
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:148
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:151
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:154
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:157
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:160
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:163
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:166
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:169
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:304
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:320
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:331
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:337
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:90
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:100
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:207
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:212
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:156
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:159
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:167
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:249
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:278
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:315
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:318
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:321
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:324
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:90
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:108
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:107
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:109
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:146
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:108
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:139
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:142
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:152
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:162
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:270
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:274
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:277
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:279
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:281
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:282
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:284
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:286
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:357
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:427
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:172
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:480
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:500
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:542
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:545
+msgid "Floating bubble"
+msgstr ""
+
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:61
+#, c-format
+msgid "Attack %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:62
+#, c-format
+msgid "Defense %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:63
+#, c-format
+msgid "HP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:64
+#, c-format
+msgid "MP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:167
+msgid "Unknown item"
+msgstr ""
diff --git a/po/te.po b/po/te.po
index e9fd14906..a499ee04d 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,340 +18,364 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "పొరపాట�"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "గ�ర�త�తెలియని ఆదేశం."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "సాధారణ"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -359,23 +384,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "పేర�"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -383,79 +409,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "వెల: %s / మొత�తం: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "నిష�క�రమించ�"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "గరిష�ఠ"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "రద�ద�చేయి"
 
@@ -491,7 +521,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "సంకేతపదాన�ని మార�చ�"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "సంకేతపదం:"
@@ -518,81 +548,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "పేర�:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "సృష�టించ�"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "ప�ర�ష�డ�"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "స�త�రీ"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "మీ పేర� కనీసం 4 అక�షరాల పొడవ�ండాలి."
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr ""
 
@@ -600,120 +635,122 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "తొలగించ�"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -726,508 +763,553 @@ msgstr "అవ�న�"
 msgid "No"
 msgstr "కాద�"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "పటం"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "సరే"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "సహాయం"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "బర�వ�:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "అన�నీ"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "ప�రవేశించ�"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "తద�పరి"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1240,345 +1322,382 @@ msgstr "పంపించ�"
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "ఆటగాళ�ళ�"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -1622,200 +1741,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:64
-msgid "Sfx volume"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:65
-msgid "Music volume"
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "రంగ�ల�"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1863,40 +2021,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1919,360 +2077,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "ఆటగాళ�ళ�"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2288,408 +2546,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
+msgstr "నిండ�తెర"
+
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "పాఠ�యం"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
+msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "గరిష�ఠ"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
+msgstr ""
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
-msgstr "నిండ�తెర"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
+msgstr ""
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "పాఠ�యం"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "గరిష�ఠ"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2697,502 +2988,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "స�థాయి: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3216,26 +3144,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3243,33 +3171,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "పేర�: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3421,23 +3349,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3502,7 +3430,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3540,6 +3469,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3669,557 +3633,873 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4235,142 +4515,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4404,418 +4672,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4829,160 +5093,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -4991,7 +5255,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -5000,7 +5264,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5009,7 +5273,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5018,7 +5282,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5288,41 +5552,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5330,129 +5594,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/th.po b/po/th.po
index 50eaf5cff..856f4a0ea 100644
--- a/po/th.po
+++ b/po/th.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,335 +18,359 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "ตั้งค่า"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "ผิดพลาด"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -354,23 +379,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -378,79 +404,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "ซื้อ"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "ออ�"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "ย�เลิ�"
 
@@ -486,7 +516,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "รหัสผ่าน:"
@@ -513,81 +543,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "สร้างตัวละคร"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "ชื่อ:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "สร้าง"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "ชาย"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "ห�ิง"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "ยืนยัน�ารลบตัวละคร"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "คุณ�น่ใจ�ล้วหรือที่จะลบตัวละครนี้?"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr ""
 
@@ -595,120 +630,122 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "ลบทิ้ง"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -721,506 +758,551 @@ msgstr "ใช่"
 msgid "No"
 msgstr "ไม่"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "ใช้"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "ทิ้ง"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "เข้าระบบ"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "สมัครสมาชิ�"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "ถัดไป"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1233,345 +1315,382 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr ""
 
@@ -1615,200 +1734,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:64
-msgid "Sfx volume"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:65
-msgid "Music volume"
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1856,40 +2014,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1912,360 +2070,460 @@ msgstr ""
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr ""
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2281,408 +2539,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:78
+msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr ""
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2690,502 +2981,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "เลเวล: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3209,26 +3137,26 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:332
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #: src/gui/unregisterdialog.cpp:54
@@ -3236,33 +3164,33 @@ msgstr ""
 msgid "Name: %s"
 msgstr "ชื่อ: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "�ำลังเชื่อมต่อ..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr ""
 
@@ -3414,23 +3342,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3495,7 +3423,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3533,6 +3462,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3662,556 +3626,872 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4227,142 +4507,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4396,418 +4664,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4821,160 +5085,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr ""
 
@@ -4983,7 +5247,7 @@ msgstr ""
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr ""
 
@@ -4992,7 +5256,7 @@ msgstr ""
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr ""
 
@@ -5001,7 +5265,7 @@ msgstr ""
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr ""
 
@@ -5010,7 +5274,7 @@ msgstr ""
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr ""
 
@@ -5280,41 +5544,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5322,129 +5586,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/tr.po b/po/tr.po
index fd3148eab..47887321b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,335 +18,359 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Kur"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr "Video"
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "Hata"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "Bilinmeyen komut."
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "Sohbeti kapatır."
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "Genel"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "Ekrangörüntüsü kaydı başarısız."
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "Gelen takas istekleri görmezden geliniyor."
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -354,23 +379,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "Ä°sim"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "Saldırı"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "KonuÅŸ"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -378,79 +404,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "Sıfırla"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "Satın al"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Fiyat: %s / Toplam: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "En Fazla"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "MaÄŸaza"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "Satış"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "Ä°ptal"
 
@@ -486,7 +516,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Åžifre DeÄŸiÅŸtir"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Åžifre:"
@@ -513,81 +543,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "Karakter oluÅŸturma"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Ä°sim:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "OluÅŸtur"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "Erkek"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "Kadın"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "Adınızda en az 4 karakter gerekir."
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "Karakter Ä°statistik Tamam"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "Bu karakteri silmek istediÄŸinize emin misiniz?"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "Hesap ve Karakter Yönetimi"
 
@@ -595,120 +630,122 @@ msgstr "Hesap ve Karakter Yönetimi"
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "Hesabı Kapat"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "Sil"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "Sohbet"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -721,506 +758,551 @@ msgstr "Evet"
 msgid "No"
 msgstr "Hayır"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "Harita"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "Kapat"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "Tamam"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Bağlantı Noktası:"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Ekipman"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "Yardım"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
-msgstr "Envanter"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr "Envanter"
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "Donatmak"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "Kullan"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "Bölme"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "Ağırlık:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "Depo"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "Almak"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Hepsi"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "Oturum Aç"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Sunucu:"
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Ãœye ol"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "Sunucu bekleniyor"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "Sonraki"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Alıcı:"
@@ -1233,345 +1315,382 @@ msgstr "Gönder"
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "Ticaret"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "Oyuncular"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "Geçiş sunucusu"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "Geçiş karakteri"
 
@@ -1615,200 +1734,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr "Bağlantı Noktası:"
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "Ekle"
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "Ses"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "Ses"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "SFX ses"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "Müzik ses seviyesi"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1856,40 +2014,40 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "Uygula"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "Kalibrasyon"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "Dur"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -1912,360 +2070,460 @@ msgstr "Varsayılan"
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "Canavarlar"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "Oyuncular"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "ArkadaÅŸ"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "Yazı tipi boyutu"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2281,408 +2539,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "Metin yok"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "Metin"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "kapalı"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "düşük"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "yüksek"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "orta"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "Tam ekran"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
-msgstr "sohbet"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
-msgstr ""
-
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "Video"
-
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
-msgstr ""
-
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr ""
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:396
 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:514
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL deÄŸiÅŸikliklerini uygulamak yeniden baÅŸlatma gerektirir."
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "Metin yok"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "Metin"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "kapalı"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "düşük"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "yüksek"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "orta"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr "Ekle"
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Beceriler"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr "Yukarı"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "Birlik"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "Parti"
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "Birlik oluÅŸturma"
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2690,502 +2981,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "Seviye: %d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP:"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "Exp:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "Ä°ÅŸ:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3209,60 +3137,60 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "DeÄŸiÅŸtir"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
+msgstr "Yeterli para yok."
+
+#: src/gui/tradewindow.cpp:454
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "Yeterli para yok."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Ä°sim: %s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "Güncelleniyor..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "BaÅŸlat"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "Tamamlandı"
 
@@ -3414,23 +3342,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3495,7 +3423,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
@@ -3533,6 +3462,41 @@ msgstr ""
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3662,556 +3626,872 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "Yukarı Taşı"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "Aşağı Taşı"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "Sola Taşı"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "Hedef Oyuncu"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "Ekran Görüntüsü"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "Durum penceresi"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "Sohbet Penceresi"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Hata Ayıklama Penceresi"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4227,142 +4507,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4396,418 +4664,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4821,160 +5085,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "Güçlülük"
 
@@ -4983,7 +5247,7 @@ msgstr "Güçlülük"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "Çeviklik"
 
@@ -4992,7 +5256,7 @@ msgstr "Çeviklik"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "Maharet"
 
@@ -5001,7 +5265,7 @@ msgstr "Maharet"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "yaşama gücü"
 
@@ -5010,7 +5274,7 @@ msgstr "yaşama gücü"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "Istihbarat"
 
@@ -5280,41 +5544,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5322,129 +5586,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "Åžans"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "isimsiz"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/vls.po b/po/vls.po
new file mode 100644
index 000000000..205c9dea2
--- /dev/null
+++ b/po/vls.po
@@ -0,0 +1,5723 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"Language-Team: Vlaams (http://www.transifex.net/projects/p/manaplus/language/vls/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vls\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: src/actorspritemanager.cpp:1168
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:560
+msgid "miss"
+msgstr ""
+
+#. TRANSLATORS: this away status writed in player nick
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
+msgid "A"
+msgstr ""
+
+#. TRANSLATORS: this inactive status writed in player nick
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
+msgid "I"
+msgstr ""
+
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
+msgid "Setup"
+msgstr ""
+
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr ""
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
+msgid "Connecting to server"
+msgstr ""
+
+#: src/client.cpp:1104
+msgid "Logging in"
+msgstr ""
+
+#: src/client.cpp:1138
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:1242
+msgid "Requesting characters"
+msgstr ""
+
+#: src/client.cpp:1277
+msgid "Connecting to the game server"
+msgstr ""
+
+#: src/client.cpp:1287
+msgid "Changing game servers"
+msgstr ""
+
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227
+msgid "Error"
+msgstr ""
+
+#: src/client.cpp:1348
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:1374
+msgid "Password Change"
+msgstr ""
+
+#: src/client.cpp:1375
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:1394
+msgid "Email Change"
+msgstr ""
+
+#: src/client.cpp:1395
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:1415
+msgid "Unregister Successful"
+msgstr ""
+
+#: src/client.cpp:1416
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1821
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1855 src/client.cpp:1861
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/client.cpp:1882
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/commandhandler.cpp:215
+msgid "Unknown command."
+msgstr ""
+
+#: src/commandhandler.cpp:335
+msgid "Cannot send empty whispers!"
+msgstr ""
+
+#: src/commandhandler.cpp:349
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
+msgstr ""
+
+#: src/commandhandler.cpp:369
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr ""
+
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:396
+msgid "Guild name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:460
+msgid "Return toggles chat."
+msgstr ""
+
+#: src/commandhandler.cpp:460
+msgid "Message closes chat."
+msgstr ""
+
+#: src/commandhandler.cpp:471
+msgid "Return now toggles chat."
+msgstr ""
+
+#: src/commandhandler.cpp:477
+msgid "Message now closes chat."
+msgstr ""
+
+#: src/commandhandler.cpp:505
+msgid "friend"
+msgstr ""
+
+#: src/commandhandler.cpp:510
+msgid "disregarded"
+msgstr ""
+
+#: src/commandhandler.cpp:515
+msgid "neutral"
+msgstr ""
+
+#: src/commandhandler.cpp:534
+#, c-format
+msgid "Player already %s!"
+msgstr ""
+
+#: src/commandhandler.cpp:548
+#, c-format
+msgid "Player successfully %s!"
+msgstr ""
+
+#: src/commandhandler.cpp:556
+#, c-format
+msgid "Player could not be %s!"
+msgstr ""
+
+#: src/commandhandler.cpp:579
+msgid "Player wasn't ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:586
+msgid "Player no longer ignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:588
+msgid "Player could not be unignored!"
+msgstr ""
+
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
+msgid "Player already erased!"
+msgstr ""
+
+#: src/commandhandler.cpp:625
+msgid "Player successfully erased!"
+msgstr ""
+
+#: src/commandhandler.cpp:627
+msgid "Player could not be erased!"
+msgstr ""
+
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
+#, c-format
+msgid "Client uptime: %s"
+msgstr ""
+
+#: src/commandhandler.cpp:950
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:959
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:967
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:975
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:983
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/commandhandler.cpp:1062
+msgid "font cache size"
+msgstr ""
+
+#: src/commandhandler.cpp:1074
+msgid "Cache size:"
+msgstr ""
+
+#: src/commandhandler.cpp:1078
+msgid "Created:"
+msgstr ""
+
+#: src/commandhandler.cpp:1080
+msgid "Deleted:"
+msgstr ""
+
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
+msgid "Resource images:"
+msgstr ""
+
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
+msgid "Resource orphaned images:"
+msgstr ""
+
+#: src/commandhandler.h:34
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
+msgid "General"
+msgstr ""
+
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
+msgid "Debug"
+msgstr ""
+
+#: src/game.cpp:512
+msgid "Screenshot saved as "
+msgstr ""
+
+#: src/game.cpp:520
+msgid "Saving screenshot failed!"
+msgstr ""
+
+#: src/game.cpp:562
+msgid "The connection to the server was lost."
+msgstr ""
+
+#: src/game.cpp:563
+msgid "Network Error"
+msgstr ""
+
+#: src/game.cpp:1275
+msgid "Ignoring incoming trade requests"
+msgstr ""
+
+#: src/game.cpp:1285
+msgid "Accepting incoming trade requests"
+msgstr ""
+
+#: src/game.cpp:1799
+msgid "Could Not Load Map"
+msgstr ""
+
+#: src/game.cpp:1800
+#, c-format
+msgid "Error while loading %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:124
+#, c-format
+msgid "Party: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:138
+#, c-format
+msgid "Guild: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:151
+#, c-format
+msgid "Pvp rank: %d"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:162
+#, c-format
+msgid "Comment: %s"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:266
+msgid "Bot Checker"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+msgid "Name"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
+msgid "Attack"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
+msgid "Talk"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
+msgid "Move"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:300
+msgid "Result"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
+msgid "Reset"
+msgstr ""
+
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
+msgid "Buy"
+msgstr ""
+
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr ""
+
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
+msgid "+"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
+msgid "-"
+msgstr ""
+
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
+msgid "Quit"
+msgstr ""
+
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
+msgid "Max"
+msgstr ""
+
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
+msgid "Shop"
+msgstr ""
+
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
+#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
+#: src/gui/selldialog.cpp:93
+msgid "Sell"
+msgstr ""
+
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
+msgid "Cancel"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
+msgid "Change Email Address"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
+#, c-format
+msgid "Account: %s"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:54
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:146
+msgid "The email address entries mismatch."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
+msgid "Change Password"
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
+msgid "Password:"
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:66
+msgid "Type new password twice:"
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:114
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:134
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
+msgid "Name:"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:106
+msgid "Hair color:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:110
+msgid "Hair style:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
+msgid "Race:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
+msgid "Create"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
+msgid "Male"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
+msgid "Female"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
+#, c-format
+msgid "Please distribute %d points"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:273
+msgid "Your name needs to be at least 4 characters."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:359
+msgid "Character stats OK"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:373
+#, c-format
+msgid "Please remove %d points"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:76
+msgid "Confirm Character Delete"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:77
+msgid "Are you sure you want to delete this character?"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:125
+msgid "Account and Character Management"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:139
+msgid "Switch Login"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
+msgid "Unregister"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:163
+msgid "Change Email"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:256
+msgid "Incorrect password"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:289
+msgid "Enter password for deleting character"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:289
+msgid "Enter password:"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
+msgid "Delete"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:471
+msgid "Choose"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:474
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
+msgid "(empty)"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "red"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:126
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:127
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:128
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:129
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
+msgid "???"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
+msgid "Chat"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:654
+#, c-format
+msgid "Present: %s; %d players are present."
+msgstr ""
+
+#: src/gui/chatwindow.cpp:1041
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr ""
+
+#: src/gui/confirmdialog.cpp:47
+msgid "Yes"
+msgstr ""
+
+#: src/gui/confirmdialog.cpp:48
+msgid "No"
+msgstr ""
+
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
+msgid "Ignore"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
+msgid "Map"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:73
+msgid "Target"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:74
+msgid "Net"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
+msgid "Map:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:154
+msgid "Particle count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
+#, c-format
+msgid "%d FPS (Software)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:168
+#, c-format
+msgid "%d FPS (fast OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:171
+#, c-format
+msgid "%d FPS (old OpenGL)"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:178
+#, c-format
+msgid "%d FPS"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
+msgid "Textures count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:233
+#, c-format
+msgid "Particle count: %d"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
+msgid "Target Id:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
+msgid "Attack delay:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
+msgid "Minimal hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
+msgid "Maximum hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
+msgid "Critical hit:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
+#, c-format
+msgid "Ping: %s ms"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:400
+#, c-format
+msgid "In: %d bytes/s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:402
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:48
+msgid "Did You Know?"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
+msgid "Close"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:65
+msgid "< Previous"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:66
+msgid "Next >"
+msgstr ""
+
+#: src/gui/didyouknowwindow.cpp:67
+msgid "Auto open this window"
+msgstr ""
+
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
+msgid "OK"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
+msgid "Equipment"
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
+msgid "Unequip"
+msgstr ""
+
+#: src/gui/helpwindow.cpp:44
+msgid "Help"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
+msgid "Equip"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
+msgid "Use"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
+msgid "Drop..."
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
+msgid "Split"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:178
+msgid "Weight:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
+msgid "Store"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
+msgid "Retrieve"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:208
+msgid "All"
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:259
+msgid "Select amount of items to trade."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:262
+msgid "Select amount of items to drop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:265
+msgid "Select amount of items to store."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:268
+msgid "Select amount of items to retrieve."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:271
+msgid "Select amount of items to split."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:274
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:277
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:280
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:193
+#, c-format
+msgid "Weight: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:66
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:67
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr ""
+
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
+msgid "Last kill exp:"
+msgstr ""
+
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
+msgid "Time before jacko spawn:"
+msgstr ""
+
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
+#, c-format
+msgid "  Time for next level: %s"
+msgstr ""
+
+#: src/gui/killstats.cpp:363
+#, c-format
+msgid "%s %d?"
+msgstr ""
+
+#: src/gui/killstats.cpp:369
+msgid "jacko spawning"
+msgstr ""
+
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
+msgstr ""
+
+#: src/gui/logindialog.cpp:60
+msgid "Normal"
+msgstr ""
+
+#: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
+msgid "Skip"
+msgstr ""
+
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
+msgid "Login"
+msgstr ""
+
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:98
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/logindialog.cpp:112
+msgid "Remember username"
+msgstr ""
+
+#: src/gui/logindialog.cpp:113
+msgid "Update:"
+msgstr ""
+
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
+msgid "Register"
+msgstr ""
+
+#: src/gui/logindialog.cpp:124
+msgid "Change Server"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:59
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:65
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:77
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:83
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:92
+msgid "weight bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:95
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:98
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:101
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:104
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
+msgid "Need"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
+msgid "Next"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:55
+msgid "Submit"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
+msgid "NPC"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
+msgid "Clear"
+msgstr ""
+
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
+msgstr ""
+
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
+msgstr ""
+
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
+#, c-format
+msgid "Key: %s"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:91
+msgid "Unequip first"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:94
+msgid "Away outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
+msgid "Whisper"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
+msgid "Heal"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
+msgid "Be friend"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
+msgid "Erase"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
+msgid "Unignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
+msgid "Completely ignore"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
+msgid "Follow"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
+msgid "Imitation"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
+msgid "Invite to party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
+msgid "Kick from party"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
+msgid "Kick from guild"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
+msgid "Change pos in guild"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
+msgid "Invite to guild"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:266
+msgid "Kick player"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:268
+msgid "Nuke"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
+msgid "Show Items"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
+msgid "Undress"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
+msgid "Add comment"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
+msgid "Buy (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
+msgid "Sell (?)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:313
+msgid "Kick"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:324
+msgid "Remove from attack list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:329
+msgid "Add to priority attack list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:331
+msgid "Add to attack list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:333
+msgid "Add to ignore list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
+msgid "Add name to chat"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:547
+msgid "Pick up"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
+msgid "Add to chat"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:567
+msgid "Map Item"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:568
+msgid "Rename"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
+msgid "Remove"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
+msgid "Spells"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:610
+msgid "Load old spells"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:611
+msgid "Edit spell"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:637
+msgid "Disable highlight"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:639
+msgid "Enable highlight"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:643
+msgid "Remove name"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:645
+msgid "Enable away"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:647
+msgid "Disable away"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
+msgid "Leave"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
+msgid "Change guild position"
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1336
+msgid "Rename map sign          "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1338
+msgid "Name:                    "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1383
+msgid "Player comment            "
+msgstr ""
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1385
+msgid "Comment:                      "
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1787
+msgid "Add to trade"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1791
+msgid "Add to trade 10"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1792
+msgid "Add to trade half"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1793
+msgid "Add to trade all"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1803
+msgid "Store 10"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1804
+msgid "Store half"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1805
+msgid "Store all"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
+msgid "Drop all"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1844
+msgid "Retrieve 10"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1845
+msgid "Retrieve half"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1846
+msgid "Retrieve all"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
+msgid "Load old item shortcuts"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:1984
+msgid "Load old drop shortcuts"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
+msgid "Hide"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
+msgid "Show"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2061
+msgid "Reset yellow bar"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
+msgid "Copy to chat"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
+msgid "(default)"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
+msgid "Move up"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
+msgid "Move down"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:52
+msgid "Switch server"
+msgstr ""
+
+#: src/gui/quitdialog.cpp:53
+msgid "Switch character"
+msgstr ""
+
+#: src/gui/register.cpp:77
+msgid "Confirm:"
+msgstr ""
+
+#: src/gui/register.cpp:108
+msgid "Email:"
+msgstr ""
+
+#: src/gui/register.cpp:176
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:184
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr ""
+
+#: src/gui/register.cpp:207
+msgid "Passwords do not match."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:228
+msgid "Choose Your Server"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:243
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:263
+msgid "Connect"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:444
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:449
+msgid "Waiting for server..."
+msgstr ""
+
+#: src/gui/serverdialog.cpp:453
+msgid "Preparing download"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:457
+msgid "Error retreiving server list!"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:548
+msgid "requires a newer version"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:550
+#, c-format
+msgid "requires v%s"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:77
+msgid "Sfx volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:80
+msgid "Music volume"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
+msgid "Colors"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:56
+msgid "Remove colors from received chat messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:59
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:63
+msgid "Commands"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:65
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:69
+msgid "Limits"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:71
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:74
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:78
+msgid "Logs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:80
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:83
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:87
+msgid "Messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:89
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:93
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:95
+msgid "Put all whispers in tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:98
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:101
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:104
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:107
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:110
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:113
+msgid "Resize chat tabs if need"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:117
+msgid "Time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:119
+msgid "Use local time"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:49
+msgid "This is what the color looks like"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:75
+msgid "Type:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
+msgid "Static"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
+msgid "Pulse"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
+msgid "Rainbow"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
+msgid "Spectrum"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
+msgid "Delay:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:112
+msgid "Red:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:127
+msgid "Green:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:142
+msgid "Blue:"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr ""
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr ""
+
+#: src/gui/setup.cpp:75
+msgid "Reset Windows"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
+msgid "Press the button to start calibration"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
+msgid "Calibrate"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:47
+msgid "Enable joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
+msgid "Joystick"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:122
+msgid "Stop"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:80
+msgid "Keyboard"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:89
+msgid "Assign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:97
+msgid "Default"
+msgstr ""
+
+#: src/gui/setup_keyboard.cpp:133
+msgid "Key Conflict(s) Detected."
+msgstr ""
+
+#: src/gui/setup_other.cpp:38
+msgid "Misc"
+msgstr ""
+
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:46
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:49
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:52
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:56
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:59
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:65
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:68
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:71
+msgid "Highlight floor items"
+msgstr ""
+
+#: src/gui/setup_other.cpp:74
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:77
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_other.cpp:80
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_other.cpp:83
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
+#: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:98
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:101
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:104
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:111
+msgid "Player"
+msgstr ""
+
+#: src/gui/setup_other.cpp:113
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:116
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:119
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:122
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:125
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:128
+msgid "Afk message"
+msgstr ""
+
+#: src/gui/setup_other.cpp:131
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_other.cpp:134
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:137
+msgid "Enable advert protocol"
+msgstr ""
+
+#: src/gui/setup_other.cpp:143
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:146
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:152
+msgid "Log NPC dialogue"
+msgstr ""
+
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:170
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
+msgstr ""
+
+#: src/gui/setup_other.cpp:177
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:180
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:183
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_other.cpp:186
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:54
+msgid "Better perfomance (enable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:57
+msgid "Auto adjust perfomance"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:60
+msgid "Hw acceleration"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:63
+msgid "Enable opacity cache (Software, can use many memory)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:66
+msgid "Enable map reduce (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:69
+msgid "Better quality (disable for better perfomance)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:72
+msgid "Enable alpha channel fix (Software, can be very slow)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
+msgid "Enable reorder sprites."
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:82
+msgid "Small memory (enable for lower memory usage)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:85
+msgid "Disable advanced beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:88
+msgid "Disable beings caching (Software)"
+msgstr ""
+
+#: src/gui/setup_players.cpp:53
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:56
+msgid "Show level"
+msgstr ""
+
+#: src/gui/setup_players.cpp:59
+msgid "Show own name"
+msgstr ""
+
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
+msgid "Target dead players"
+msgstr ""
+
+#: src/gui/setup_players.cpp:68
+msgid "Visible names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:71
+msgid "Secure trades"
+msgstr ""
+
+#: src/gui/setup_players.cpp:74
+msgid "Unsecure chars in names"
+msgstr ""
+
+#: src/gui/setup_players.cpp:77
+msgid "Show statuses"
+msgstr ""
+
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
+msgid "Relation"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:71
+msgid "Neutral"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:72
+msgid "Friend"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:73
+msgid "Disregarded"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:74
+msgid "Ignored"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:75
+msgid "Erased"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
+msgid "Allow trading"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:245
+msgid "Allow whispers"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:248
+msgid "Old"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:250
+msgid "Relations"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:272
+msgid "When ignoring:"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:82
+msgid "Tiny (10)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:83
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:84
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:85
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:86
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:87
+msgid "Huge (15)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
+msgid "Theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:167
+msgid "Gui theme"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:170
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:171
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:172
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:173
+msgid "Secure font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
+msgid "Font size"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:352
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
+msgid "Restart your client for the change to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:194
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:195
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:196
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
+msgstr ""
+
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
+msgstr ""
+
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
+msgstr ""
+
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
+msgstr ""
+
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
+msgstr ""
+
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
+msgstr ""
+
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr ""
+
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr ""
+
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
+msgstr ""
+
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
+msgstr ""
+
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
+msgstr ""
+
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
+msgstr ""
+
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
+msgstr ""
+
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr ""
+
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:119
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:120
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:128
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
+#: src/net/manaserv/tradehandler.cpp:127
+msgid "Request for Trade"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:762
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
+msgid "Skills"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:288
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:341
+#, c-format
+msgid "Skill points available: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
+#, c-format
+msgid "Skill Set %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:432
+#, c-format
+msgid "Skill %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
+#, c-format
+msgid "Lvl: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:546
+#, c-format
+msgid "Lvl: %d (%+d)"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
+msgid "Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:174
+#, c-format
+msgid "Invited user %s to guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:188
+#, c-format
+msgid "Guild %s quit requested."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:215
+msgid "Member Invite to Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:216
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:225
+msgid "Leave Guild?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:226
+#, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
+msgid "Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:374
+#, c-format
+msgid "Invited user %s to party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:388
+#, c-format
+msgid "Party %s quit requested."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:415
+msgid "Member Invite to Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:416
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:425
+msgid "Leave Party?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:426
+#, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:650
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:928
+msgid "Atk"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:969
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1001
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1036
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1196
+msgid "Create Guild"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
+msgid "Create Party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
+msgid "Social"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1262
+msgid "Invite"
+msgstr ""
+
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1425
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1442
+#, c-format
+msgid "Accepted guild invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1455
+#, c-format
+msgid "Rejected guild invite from %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1502
+#, c-format
+msgid "Creating guild called %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1525
+#, c-format
+msgid "Creating party called %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1539
+msgid "Guild Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1540
+msgid "Choose your guild's name."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1554
+msgid "Received guild request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1560
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1566
+msgid "Accept Guild Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1581
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1592
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1596
+#, c-format
+msgid "You have been invited to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1604
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1609
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1618
+msgid "Accept Party Invite"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1633
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1638
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1639
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
+msgid "Specials"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
+#, c-format
+msgid "Level: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:157
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:164
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:178
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:211
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
+#, c-format
+msgid "Character points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:275
+#, c-format
+msgid "Level: %d (GM %d)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:331
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:112
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:119
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:167
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:184
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:188
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:193
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:196
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:208
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:214
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:220
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:226
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:232
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:237
+msgid "Save"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:60
+msgid "Propose trade"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:61
+msgid "Confirmed. Waiting..."
+msgstr ""
+
+#: src/gui/tradewindow.cpp:62
+msgid "Agree trade"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:63
+msgid "Agreed. Waiting..."
+msgstr ""
+
+#: src/gui/tradewindow.cpp:66
+msgid "Trade: You"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
+#, c-format
+msgid "You get %s"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:112
+msgid "You give:"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:116
+msgid "Change"
+msgstr ""
+
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
+msgstr ""
+
+#: src/gui/tradewindow.cpp:454
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+
+#: src/gui/unregisterdialog.cpp:54
+#, c-format
+msgid "Name: %s"
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:140
+msgid "Updating..."
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:167
+msgid "Connecting..."
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:170
+msgid "Play"
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:571
+msgid "##1  The update process is incomplete."
+msgstr ""
+
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updaterwindow.cpp:573
+msgid "##1  It is strongly recommended that"
+msgstr ""
+
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updaterwindow.cpp:575
+msgid "##1  you try again later."
+msgstr ""
+
+#: src/gui/updaterwindow.cpp:751
+msgid "Completed"
+msgstr ""
+
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:103
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:197
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:631
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:670
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
+msgid "/users > Lists the users in the current channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:53
+msgid "/topic > Set the topic of the current channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:54
+msgid "/quit > Leave a channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:55
+msgid "/op > Make a user a channel operator"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:56
+msgid "/kick > Kick a user from the channel"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:66
+msgid "Command: /users"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:67
+msgid "This command shows the users in this channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:71
+msgid "Command: /topic <message>"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:72
+msgid "This command sets the topic to <message>."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:76
+msgid "Command: /quit"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:77
+msgid "This command leaves the current channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:78
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:83
+msgid "Command: /op <nick>"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:84
+msgid "This command makes <nick> a channel operator."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:87
+msgid "Channel operators can kick and op other users from the channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:92
+msgid "Command: /kick <nick>"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:93
+msgid "This command makes <nick> leave the channel."
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:118
+msgid "Need a user to op!"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:125
+msgid "Need a user to kick!"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:151
+msgid "Global announcement:"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:157
+#, c-format
+msgid "Global announcement from %s:"
+msgstr ""
+
+#: src/gui/widgets/chattab.cpp:184
+#, c-format
+msgid "%s whispers: %s"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:107
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:108
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:109
+msgid "/close > Close the whisper tab"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:119
+msgid "Command: /close"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:120
+msgid "This command closes the current whisper tab."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:124
+msgid "Command: /ignore"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:125
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "Status"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Select World"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:82
+msgid "Change Login"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:83
+msgid "Choose World"
+msgstr ""
+
+#: src/inventory.cpp:251
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:253
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
+msgid "Move Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:47
+msgid "Move Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:48
+msgid "Move Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:49
+msgid "Move Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:52
+msgid "Target & Attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:54
+msgid "Move to Target"
+msgstr ""
+
+#: src/keyboardconfig.cpp:56
+msgid "Change Move to Target type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:58
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:60
+msgid "Set home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:62
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
+msgid "Target Closest"
+msgstr ""
+
+#: src/keyboardconfig.cpp:70
+msgid "Target NPC"
+msgstr ""
+
+#: src/keyboardconfig.cpp:71
+msgid "Target Player"
+msgstr ""
+
+#: src/keyboardconfig.cpp:73
+msgid "Pickup"
+msgstr ""
+
+#: src/keyboardconfig.cpp:74
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:76
+msgid "Hide Windows"
+msgstr ""
+
+#: src/keyboardconfig.cpp:78
+msgid "Sit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:79
+msgid "Screenshot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:80
+msgid "Enable/Disable Trading"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82
+msgid "Change Map View Mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
+#, c-format
+msgid "Item Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
+msgid "Help Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:133
+msgid "Status Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:135
+msgid "Inventory Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:137
+msgid "Equipment Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:139
+msgid "Skill Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:141
+msgid "Minimap Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:143
+msgid "Chat Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:145
+msgid "Item Shortcut Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:147
+msgid "Setup Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:149
+msgid "Debug Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:151
+msgid "Social Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:153
+msgid "Emote Shortcut Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:155
+msgid "Outfits Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:157
+msgid "Shop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Kill Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:163
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:165
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:170
+msgid "Did you know Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:173
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:175
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr ""
+
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:283
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:285
+msgid "Copy equipped to Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
+msgid "Toggle Chat"
+msgstr ""
+
+#: src/keyboardconfig.cpp:290
+msgid "Scroll Chat Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:292
+msgid "Scroll Chat Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:294
+msgid "Previous Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Next Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:299
+msgid "Close current Chat Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:301
+msgid "Previous chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:303
+msgid "Next chat line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:305
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:307
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:310
+msgid "Ignore input 1"
+msgstr ""
+
+#: src/keyboardconfig.cpp:312
+msgid "Ignore input 2"
+msgstr ""
+
+#: src/keyboardconfig.cpp:314
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:315
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:318
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:320
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:322
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:324
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:326
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:328
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:332
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:334
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:336
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:342
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:344
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:346
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:348
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:351
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:352
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:354
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:356
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:358
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:360
+msgid "Modifier key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:439
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
+msgstr ""
+
+#: src/localplayer.cpp:1436
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1439
+msgid "Item is too heavy."
+msgstr ""
+
+#: src/localplayer.cpp:1442
+msgid "Item is too far away."
+msgstr ""
+
+#: src/localplayer.cpp:1445
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1448
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1451
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1454
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1478
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
+msgid "Away"
+msgstr ""
+
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
+msgid "Follow: "
+msgstr ""
+
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
+msgid "Follow canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3792
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:4150
+msgid "You see "
+msgstr ""
+
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
+msgstr ""
+
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
+msgstr ""
+
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
+msgstr ""
+
+#: src/main.cpp:61
+msgid "Options:"
+msgstr ""
+
+#: src/main.cpp:62
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#: src/main.cpp:63
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:64
+msgid "  -v --version        : Display the version"
+msgstr ""
+
+#: src/main.cpp:65
+msgid "  -h --help           : Display this help"
+msgstr ""
+
+#: src/main.cpp:66
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr ""
+
+#: src/main.cpp:67
+msgid "  -U --username       : Login with this username"
+msgstr ""
+
+#: src/main.cpp:68
+msgid "  -P --password       : Login with this password"
+msgstr ""
+
+#: src/main.cpp:69
+msgid "  -c --character      : Login with this character"
+msgstr ""
+
+#: src/main.cpp:70
+msgid "  -s --server         : Login server name or IP"
+msgstr ""
+
+#: src/main.cpp:71
+msgid "  -p --port           : Login server port"
+msgstr ""
+
+#: src/main.cpp:72
+msgid "     --update-host    : Use this update host"
+msgstr ""
+
+#: src/main.cpp:73
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+
+#: src/main.cpp:75
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:76
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+
+#: src/main.cpp:78
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+
+#: src/main.cpp:80
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+
+#: src/main.cpp:81
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr ""
+
+#: src/net/ea/buysellhandler.cpp:163
+msgid "Nothing to sell."
+msgstr ""
+
+#: src/net/ea/buysellhandler.cpp:171
+msgid "Thanks for buying."
+msgstr ""
+
+#: src/net/ea/buysellhandler.cpp:179
+msgid "Unable to buy."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:66
+msgid "Strength:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:67
+msgid "Agility:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:68
+msgid "Vitality:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:69
+msgid "Intelligence:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:70
+msgid "Dexterity:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:71
+msgid "Luck:"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:115
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:119
+msgid "Cannot use this ID."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:122
+msgid "Unknown char-server failure."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:151
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:158
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:161
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:164
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
+msgid "Info"
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182
+msgid "Character deleted."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:188
+msgid "Failed to delete character."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
+msgid "Channels are not supported!"
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:129
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:137
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:346
+msgid "MVP player."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:350
+msgid "MVP player: "
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
+msgstr ""
+
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
+msgstr ""
+
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
+msgid "Guild created."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
+msgid "You are already in guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:98
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:103
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:180
+#, c-format
+msgid "Guild name: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:182
+#, c-format
+msgid "Guild master: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:184
+#, c-format
+msgid "Guild level: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:185
+#, c-format
+msgid "Online members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:187
+#, c-format
+msgid "Max members: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:189
+#, c-format
+msgid "Average level: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:191
+#, c-format
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:192
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:194
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:412
+msgid "Could not inivte user to guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:416
+msgid "User rejected guild invite."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:420
+msgid "User is now part of your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:424
+msgid "Your guild is full."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:428
+msgid "Unknown guild invite response."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:464
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
+msgstr ""
+
+#: src/net/ea/guildhandler.cpp:512
+#, c-format
+msgid "%s has kicked from your guild."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:71
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:72
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:73
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:74
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:75
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:85
+msgid "This command invites <nick> to party with you."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:92
+msgid "This command causes the player to leave the party."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:96
+msgid "Command: /item <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:98
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:99
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:102
+msgid "Command: /item"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:103
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:108
+msgid "Command: /exp <policy>"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:109
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:111
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:114
+msgid "Command: /exp"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:115
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
+msgid "Item sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
+msgid "Item sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
+msgid "Item sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:158
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
+msgid "Experience sharing enabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
+msgid "Experience sharing disabled."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
+msgid "Experience sharing not possible."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:197
+msgid "Experience sharing unknown."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:404
+msgid "Failed to use item."
+msgstr ""
+
+#: src/net/ea/inventoryhandler.cpp:572
+msgid "Unable to equip."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:132
+msgid "Account was not found. Please re-login."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:138
+msgid "New password too short."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:214
+msgid "Unregistered ID."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:217
+msgid "Wrong password."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:220
+msgid "Account expired."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:223
+msgid "Rejected from server."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:226
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:230
+msgid "Client too old."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:233
+#, 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/ea/loginhandler.cpp:240
+msgid "Server overpopulated."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:243
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/loginhandler.cpp:249
+msgid "Username permanently erased."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:81
+msgid "Could not create party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:83
+msgid "Party successfully created."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:139
+#, c-format
+msgid "%s has joined your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:175
+#, c-format
+msgid "%s is already a member of a party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:180
+#, c-format
+msgid "%s refused your invitation."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:185
+#, c-format
+msgid "%s is now a member of your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:190
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:195
+#, c-format
+msgid "QQQ Unknown invite response for %s."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:359
+msgid "You have left the party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:372
+#, c-format
+msgid "%s has left your party."
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:449
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
+msgid "You are dead."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:103
+msgid "Insert coin to continue."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:121
+msgid "You're not dead yet. You're just resting."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:122
+msgid "You are no more."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:123
+msgid "You have ceased to be."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:124
+msgid "You've expired and gone to meet your maker."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:125
+msgid "You're a stiff."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:126
+msgid "Bereft of life, you rest in peace."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:127
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:128
+msgid "Your metabolic processes are now history."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:129
+msgid "You're off the twig."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:130
+msgid "You've kicked the bucket."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:131
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:133
+msgid "You are an ex-player."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:134
+msgid "You're pining for the fjords."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
+msgid "Message"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:337
+msgid ""
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:347
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:453
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:459
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:505
+msgid "Cannot raise skill!"
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:623
+msgid "Equip arrows first."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:143
+msgid "Trade failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:146
+msgid "Emote failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:149
+msgid "Sit failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:152
+msgid "Chat creating failed!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:155
+msgid "Could not join party!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:158
+msgid "Cannot shout!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:171
+msgid "You have not yet reached a high enough lvl!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:174
+msgid "Insufficient HP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:177
+msgid "Insufficient SP!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:180
+msgid "You have no memos!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:183
+msgid "You cannot do that right now!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:186
+msgid "Seems you need more money... ;-)"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:189
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:193
+msgid "You need another red gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:196
+msgid "You need another blue gem!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:199
+msgid "You're carrying to much to do this!"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:202
+msgid "Huh? What's that?"
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:213
+msgid "Warp failed..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:216
+msgid "Could not steal anything..."
+msgstr ""
+
+#: src/net/ea/specialhandler.cpp:219
+msgid "Poison had no effect..."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:135
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:139
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:143
+msgid "Trade cancelled due to an unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:149
+#, c-format
+msgid "Trade: You and %s"
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:159
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:172
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:237
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:242
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:247
+msgid "Failed adding item. You can't trade this item."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:251
+msgid "Failed adding item for unknown reason."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:338
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:148
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:151
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:154
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:157
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:160
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:163
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:166
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:169
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:304
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:320
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:331
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:337
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:90
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:100
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:207
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:212
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:156
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:159
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:167
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:249
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:278
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:315
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:318
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:321
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:324
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:90
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:108
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:107
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:109
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:146
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:133
+msgid "Thanks for selling."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:137
+msgid "Unable to sell."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:140
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:143
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:108
+#, c-format
+msgid "Strength %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:109
+#, c-format
+msgid "Agility %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:110
+#, c-format
+msgid "Vitality %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:111
+#, c-format
+msgid "Intelligence %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:112
+#, c-format
+msgid "Dexterity %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:113
+#, c-format
+msgid "Luck %+d"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:139
+msgid "Authentication failed."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:142
+msgid "No servers available."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:147
+msgid "Someone else is trying to use this account."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:152
+msgid "This account is already logged in."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:156
+msgid "Speed hack detected."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:159
+msgid "Duplicated login."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:162
+msgid "Unknown connection error."
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:235
+msgid "Got disconnected from server!"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:270
+msgid "Luck"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:273
+msgid "Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:274
+msgid "M.Attack"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:275
+msgid "M.Defense"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:277
+#, no-c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:279
+#, no-c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:281
+#, no-c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:282
+msgid "Attack Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:284
+msgid "Walk Delay"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:286
+msgid "Attack Range"
+msgstr ""
+
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/tmwa/network.cpp:357
+msgid "Unable to resolve host \""
+msgstr ""
+
+#: src/net/tmwa/network.cpp:427
+msgid "Connection to server terminated. "
+msgstr ""
+
+#: src/net/tmwa/partyhandler.cpp:172
+#, c-format
+msgid "%s is not in your party!"
+msgstr ""
+
+#: src/playerrelations.cpp:480
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:500
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:542
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:545
+msgid "Floating bubble"
+msgstr ""
+
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:61
+#, c-format
+msgid "Attack %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:62
+#, c-format
+msgid "Defense %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:63
+#, c-format
+msgid "HP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:64
+#, c-format
+msgid "MP %+d"
+msgstr ""
+
+#: src/resources/itemdb.cpp:167
+msgid "Unknown item"
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 271a4d4ef..27896366a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,80 +10,84 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-02-06 02:06+0300\n"
-"PO-Revision-Date: 2012-02-02 16:45+0000\n"
+"POT-Creation-Date: 2012-02-29 01:39+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
-"team/zh_CN/)\n"
+"language/zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1169
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr "在地图上��"
 
-#: src/being.cpp:553
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:553
+#: src/being.cpp:560
 msgid "miss"
 msgstr "无法出售无法出售的物�。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1534 src/gui/whoisonline.cpp:749
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1539 src/gui/whoisonline.cpp:754
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:957 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "魔法攻击"
 
-#: src/client.cpp:964 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:969 src/gui/setup_video.cpp:319
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:974
+#: src/client.cpp:990
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1056
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr "魔法防御"
 
-#: src/client.cpp:1088
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr "�试�起�存在的物�。"
 
-#: src/client.cpp:1121
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr "�起物��生�存在的物�。"
 
-#: src/client.cpp:1222
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1257
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr "连接到游��务器"
 
-#: src/client.cpp:1267
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr "更改游��务器"
 
-#: src/client.cpp:1310 src/client.cpp:1317 src/client.cpp:1451
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
 #: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
@@ -93,218 +97,218 @@ msgstr "更改游��务器"
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1326
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr "请求注册的详细信�"
 
-#: src/client.cpp:1352
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr "密�更改"
 
-#: src/client.cpp:1353
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr "更改密��功�"
 
-#: src/client.cpp:1372
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr "更改电�邮件"
 
-#: src/client.cpp:1373
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr "更改电�邮件�功�"
 
-#: src/client.cpp:1393
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr "注销�功"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr "��，�时欢迎回�... ..."
 
-#: src/client.cpp:1599 src/client.cpp:1632 src/client.cpp:1647
-#: src/client.cpp:2079 src/client.cpp:2086
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s �存在，并且无法创建�退出。"
 
-#: src/client.cpp:1785
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机: %s"
 
-#: src/client.cpp:1819 src/client.cpp:1825
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误�"
 
-#: src/client.cpp:1846
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s �存在并且无法创建�退出。"
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "未知命令。"
 
-#: src/commandhandler.cpp:333
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "无法��空白密语�"
 
-#: src/commandhandler.cpp:347
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr "无法� \"%s\" 建立一个�人谈�标签页�或者已�存在，或者那就是自己。"
 
-#: src/commandhandler.cpp:367
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "请求加入频�%s。"
 
-#: src/commandhandler.cpp:383 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "帮会�称缺失。"
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr "公会�称是缺少的。"
 
-#: src/commandhandler.cpp:407 src/commandhandler.cpp:524
-#: src/commandhandler.cpp:565 src/commandhandler.cpp:605
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr "请指定一个�称。"
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:458
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "讯�关闭�天。"
 
-#: src/commandhandler.cpp:469
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "<回车>键现在切��天。"
 
-#: src/commandhandler.cpp:475
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "讯�现在关闭�天。"
 
-#: src/commandhandler.cpp:503
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr "朋�"
 
-#: src/commandhandler.cpp:508
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr "无视"
 
-#: src/commandhandler.cpp:513
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr "中性"
 
-#: src/commandhandler.cpp:532
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已�%s!"
 
-#: src/commandhandler.cpp:546
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家�功%s!"
 
-#: src/commandhandler.cpp:554
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家�能为 %s"
 
-#: src/commandhandler.cpp:577
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr "是�能忽视的�"
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr "玩家��被忽略�"
 
-#: src/commandhandler.cpp:586
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr "玩家�能被忽略!"
 
-#: src/commandhandler.cpp:592
+#: src/commandhandler.cpp:594
 msgid "blacklisted"
 msgstr ""
 
-#: src/commandhandler.cpp:597
+#: src/commandhandler.cpp:599
 msgid "enemy"
 msgstr ""
 
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr "玩家已�被删除!"
 
-#: src/commandhandler.cpp:623
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr "玩家�功删除�"
 
-#: src/commandhandler.cpp:625
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr "玩家无法删除�"
 
-#: src/commandhandler.cpp:938 src/commandhandler.cpp:984
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:948
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:957
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:965
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1060
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr "字体缓存大�"
 
-#: src/commandhandler.cpp:1072
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr "创建于："
 
-#: src/commandhandler.cpp:1078
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr "删除："
 
-#: src/commandhandler.cpp:1236 src/commandhandler.cpp:1243
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1238 src/commandhandler.cpp:1245
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -313,11 +317,11 @@ msgstr ""
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"。"
 
-#: src/game.cpp:256 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "常规"
 
-#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:415
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr "调试 "
 
@@ -378,18 +382,18 @@ msgstr "评论: %s"
 msgid "Bot Checker"
 msgstr "挂机检查"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "姓�"
 
 #: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
 #: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
-#: src/keyboardconfig.cpp:49 src/net/tmwa/generalhandler.cpp:272
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "攻击"
 
 #: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
-#: src/keyboardconfig.cpp:62
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "说�"
 
@@ -427,7 +431,7 @@ msgstr ""
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "+"
 
@@ -435,25 +439,25 @@ msgstr "+"
 #. You may change this symbol if your language uses another.
 #: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "-"
 
 #: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
 #: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
-#: src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "退出"
 
 #: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
-#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "商店"
 
@@ -477,8 +481,8 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
 #: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
 #: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
-#: src/gui/register.cpp:82 src/gui/setup.cpp:72 src/gui/socialwindow.cpp:1199
-#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "�消"
@@ -651,8 +655,8 @@ msgid "Enter password:"
 msgstr "输入密�："
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "删除"
 
@@ -670,6 +674,7 @@ msgid "(empty)"
 msgstr "()"
 
 #: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr "默认"
 
@@ -727,24 +732,23 @@ msgstr "彩虹3"
 
 #: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/setup_joystick.cpp:60 src/gui/setup_relations.cpp:224
-#: src/gui/setup_theme.cpp:74 src/gui/setup_theme.cpp:128
-#: src/gui/setup_theme.cpp:174 src/gui/setup_video.cpp:211
-#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
-#: src/gui/textcommandeditor.cpp:160
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "？？？"
 
-#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "�天"
 
-#: src/gui/chatwindow.cpp:653
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1040
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -768,7 +772,7 @@ msgid "Ignore"
 msgstr "忽略"
 
 #: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
-#: src/gui/setup_other.cpp:64
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "地图"
 
@@ -843,62 +847,76 @@ msgstr ""
 msgid "Particle count: %d"
 msgstr "粒�数：%d个"
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
-#: src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr "目标："
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr "目标ID："
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
-#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
-msgid "Target Level:"
-msgstr "目标水平："
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
-#: src/gui/debugwindow.cpp:348
-msgid "Target Party:"
-msgstr "目标："
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
-#: src/gui/debugwindow.cpp:349
-msgid "Target Guild:"
-msgstr "目标公会："
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
-#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr "攻击延迟："
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:352
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
-#: src/gui/debugwindow.cpp:353
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr "目标水平："
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr "目标："
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr "目标公会："
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "输入:%d 字节/"
 
-#: src/gui/debugwindow.cpp:397
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -925,8 +943,8 @@ msgstr "下一页>"
 msgid "Auto open this window"
 msgstr "自动打开这个窗�"
 
-#: src/gui/editdialog.cpp:47 src/gui/editserverdialog.cpp:78
-#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:45
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "确定"
@@ -1038,7 +1056,7 @@ msgstr "��："
 
 #: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
 #: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
-#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:73
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "存储"
 
@@ -1097,89 +1115,89 @@ msgstr ","
 msgid "Weight: %s"
 msgstr "��：%s"
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr "�敌统计"
 
-#: src/gui/killstats.cpp:67
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr "��统计"
 
-#: src/gui/killstats.cpp:68
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr "��定时器"
 
-#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr "等级:%d 在 %f%%"
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
-#: src/gui/killstats.cpp:228
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
-#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
-#: src/gui/killstats.cpp:240
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
-#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
-#: src/gui/killstats.cpp:326
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr "最�EXP："
 
-#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
-#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
-#: src/gui/killstats.cpp:375
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
-#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
-#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:364
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr "%s %d?"
 
-#: src/gui/killstats.cpp:370
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
@@ -1280,7 +1298,7 @@ msgid "Submit"
 msgstr "�交"
 
 #: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
@@ -1390,7 +1408,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
 #: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
 #: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
-#: src/playerrelations.cpp:465
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -1486,7 +1504,7 @@ msgstr ""
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:48
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
 msgid "Players"
 msgstr "玩家"
 
@@ -1653,12 +1671,12 @@ msgstr "显示"
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:242
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:88
-#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:983
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
 #: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr "(默认)"
@@ -1736,25 +1754,25 @@ msgstr "连接"
 msgid "Add"
 msgstr "添加"
 
-#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:271
-#: src/gui/widgets/setupitem.cpp:394
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
 msgid "Edit"
 msgstr "编辑"
 
-#: src/gui/serverdialog.cpp:448
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载�务器列表...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:453
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr "等待�务器..."
 
-#: src/gui/serverdialog.cpp:457
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr "准备下载"
 
-#: src/gui/serverdialog.cpp:461
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr "���务器列表错误�"
 
@@ -1767,155 +1785,188 @@ msgstr "需�较新版本"
 msgid "requires v%s"
 msgstr "需� v%s"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "音频"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:66
 msgid "Enable Audio"
 msgstr "�用音频"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:68
+msgid "Enable music"
+msgstr "�用音�"
+
+#: src/gui/setup_audio.cpp:71
 msgid "Enable game sfx"
 msgstr "�用游�SFX"
 
-#: src/gui/setup_audio.cpp:52
+#: src/gui/setup_audio.cpp:74
 msgid "Enable gui sfx"
 msgstr "�用GUI SFX"
 
-#: src/gui/setup_audio.cpp:53
-msgid "Enable music"
-msgstr "�用音�"
-
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
-msgstr "�用语音�天"
-
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
-msgstr "下载音�"
-
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "音频"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "音效声�"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "音�声�"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
-msgstr "公告"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
-msgstr "如果你想下载新音�,您必须�新�动您的客!"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
-msgstr "声音引擎"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr "其他"
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr "�用语音�天"
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr "下载音�"
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "颜色"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr "从收到的�天消�中删除颜色"
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr "显示�天颜色列表"
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr "命令"
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "�许在所有�天标签中使用魔法和GM命令"
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr "�制"
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr "�制�天的最大"
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr "日志"
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr "�用�天记录"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr "显示�天记录"
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr "消�"
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr "��商店消�"
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr "标签"
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "将所有密语放于标签夜"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr "在调试选项�中显示�务器的消�"
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr "标签"
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr "�用战斗“选项�"
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr "显示的战斗事件"
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr "时间"
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr "使用本地时间"
 
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
-msgid "Other"
-msgstr "其他"
-
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:124
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:128
+#: src/gui/setup_chat.cpp:127
 msgid "Show MVP messages"
 msgstr ""
 
@@ -1966,40 +2017,40 @@ msgstr "�色："
 msgid "Alpha:"
 msgstr "阿尔法："
 
-#: src/gui/setup.cpp:71
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "应用"
 
-#: src/gui/setup.cpp:74
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "�置窗�"
 
-#: src/gui/setup_joystick.cpp:70 src/gui/setup_joystick.cpp:142
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "按下开始校准按钮"
 
-#: src/gui/setup_joystick.cpp:71 src/gui/setup_joystick.cpp:140
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "校准"
 
-#: src/gui/setup_joystick.cpp:72
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "�用游��"
 
-#: src/gui/setup_joystick.cpp:75
+#: src/gui/setup_joystick.cpp:50
 msgid "Use joystick if client window inactive"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "游��"
 
-#: src/gui/setup_joystick.cpp:147
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "�止"
 
-#: src/gui/setup_joystick.cpp:149
-msgid "Rotate the stick and dont press buttons"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
 msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
@@ -2022,456 +2073,460 @@ msgstr "预设"
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲�。"
 
-#: src/gui/setup_other.cpp:39
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr "�项"
 
-#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "怪物"
 
-#: src/gui/setup_other.cpp:47
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr "显示��造�的，以怪物"
 
-#: src/gui/setup_other.cpp:50
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr "自动目标�有到达怪物"
 
-#: src/gui/setup_other.cpp:53
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr "�出显示怪物的攻击范围"
 
-#: src/gui/setup_other.cpp:57
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr "显示怪物HP�"
 
-#: src/gui/setup_other.cpp:60
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:66
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:69
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr "�出显示的地图门户网站"
 
-#: src/gui/setup_other.cpp:72
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr "�出地�项目"
 
-#: src/gui/setup_other.cpp:75
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr "�出显示�员的攻击范围"
 
-#: src/gui/setup_other.cpp:78
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:81
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr "绘制路径"
 
-#: src/gui/setup_other.cpp:84
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
-#: src/gui/setup_other.cpp:87
+#: src/gui/setup_other.cpp:86
 msgid "Enable lazy scrolling"
 msgstr ""
 
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:89
 msgid "Scroll laziness"
 msgstr ""
 
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:92
 msgid "Scroll radius"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr "移动"
 
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr "自动修�的�置"
 
-#: src/gui/setup_other.cpp:102
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr "攻击的�时移动"
 
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr "�步播放移动"
 
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr "疯狂的举动的程�"
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr "显示自己的HP�"
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr "�用快速统计"
 
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr "显示工作EXP消�"
 
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr "显示�员弹出窗�"
 
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:132
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr "显示工作"
 
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr "�用攻击过滤器"
 
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr "接�出售/购买请求"
 
-#: src/gui/setup_other.cpp:147
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr "�用商店模�"
 
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr "NPC对�"
 
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:156
 msgid "Bots support"
 msgstr "挂机支�"
 
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:158
 msgid "Enable auction bot support"
 msgstr "�用��挂机支�"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:161
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr "�用�务器端的攻击"
 
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr "�用挂机检查"
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:173
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr "�用调试日志"
 
-#: src/gui/setup_other.cpp:181
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr "低��模�"
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr "显示背景"
 
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr "自动调整"
 
-#: src/gui/setup_perfomance.cpp:61
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr "硬件加速"
 
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:77
+#: src/gui/setup_perfomance.cpp:76
 msgid "Show beings transparency"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "显示性别"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr "显示水平"
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr "显示自己的�字"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
 msgid "Enable extended mouse targeting"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr "目标死�员"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "��姓�"
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:78
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr "显示状�"
 
-#: src/gui/setup_players.cpp:81
+#: src/gui/setup_players.cpp:80
 msgid "Show ip addresses on screenshots"
 msgstr ""
 
-#: src/gui/setup_players.cpp:84
+#: src/gui/setup_players.cpp:83
 msgid "Allow self heal with mouse click"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "关系"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "好�"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "被忽视的"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr "已删除"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:76
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:77
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:242
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "�许交易"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "�许密语"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr "æ—§"
 
-#: src/gui/setup_relations.cpp:249
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr "关系"
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "当忽略时："
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr "�（10）"
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr "å°� (11)"
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr "中 (12)"
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr "大 (13)"
 
-#: src/gui/setup_theme.cpp:112
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr "大(14)"
 
-#: src/gui/setup_theme.cpp:113
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr "巨大的 (15)"
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:120
 msgid "Chinese (China)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:121
 msgid "Czech"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:122
 msgid "English"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:149
+#: src/gui/setup_theme.cpp:123
 msgid "Finnish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:150
+#: src/gui/setup_theme.cpp:124
 msgid "French"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:151
+#: src/gui/setup_theme.cpp:125
 msgid "German"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:152
+#: src/gui/setup_theme.cpp:126
 msgid "Indonesian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:153
+#: src/gui/setup_theme.cpp:127
 msgid "Polish"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:154
+#: src/gui/setup_theme.cpp:128
 msgid "Japanese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:155
+#: src/gui/setup_theme.cpp:129
 msgid "Dutch (Belgium/Flemish)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:156
+#: src/gui/setup_theme.cpp:130
 msgid "Portuguese"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:157
+#: src/gui/setup_theme.cpp:131
 msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:158
+#: src/gui/setup_theme.cpp:132
 msgid "Russian"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:159
+#: src/gui/setup_theme.cpp:133
 msgid "Spanish (Castilian)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:191
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr "主题"
 
-#: src/gui/setup_theme.cpp:193
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr "桂主题"
 
-#: src/gui/setup_theme.cpp:194
+#: src/gui/setup_theme.cpp:168
 msgid "Language"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:195
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr "主�字体"
 
-#: src/gui/setup_theme.cpp:196
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr "加粗字体"
 
-#: src/gui/setup_theme.cpp:197
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr "粒�字体"
 
-#: src/gui/setup_theme.cpp:198
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr "帮助字体"
 
-#: src/gui/setup_theme.cpp:199
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr "安全字体"
 
-#: src/gui/setup_theme.cpp:200
+#: src/gui/setup_theme.cpp:174
 msgid "Japanese font"
 msgstr "日文字体"
 
-#: src/gui/setup_theme.cpp:237
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "字体大�"
 
-#: src/gui/setup_theme.cpp:378
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr "主题更改"
 
-#: src/gui/setup_theme.cpp:379 src/gui/setup_video.cpp:636
-#: src/gui/setup_video.cpp:641
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "��您的游�客户端以使�更生效。"
 
@@ -2487,156 +2542,162 @@ msgstr "快速的OpenGL"
 msgid "Safe OpenGL"
 msgstr "安全的OpenGL"
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "无文本"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "文本"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "气泡，无�"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "有�气泡"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "关闭"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "低"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "高"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "中"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "最大"
-
-#: src/gui/setup_video.cpp:290
 msgid "Full screen"
 msgstr "全�"
 
-#: src/gui/setup_video.cpp:291
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:293
-msgid "Particle effects"
-msgstr "粒�效果"
-
-#: src/gui/setup_video.cpp:295
-msgid "Show pickup notification"
-msgstr "显示拾起通知"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "in chat"
-msgstr "�天中"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:299
-msgid "as particle"
-msgstr "作为�射武器"
-
-#: src/gui/setup_video.cpp:301
+#: src/gui/setup_video.cpp:230
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:231
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr "FPS�制："
 
-#: src/gui/setup_video.cpp:310 src/gui/setup_video.cpp:345
-#: src/gui/setup_video.cpp:574 src/gui/setup_video.cpp:730
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:325
-msgid "Overhead text"
-msgstr "头顶文字"
-
-#: src/gui/setup_video.cpp:326
-msgid "Gui opacity"
-msgstr "Gui �明度"
-
-#: src/gui/setup_video.cpp:327
-msgid "Ambient FX"
-msgstr "环境音效"
-
-#: src/gui/setup_video.cpp:328
-msgid "Particle detail"
-msgstr "l"
-
-#: src/gui/setup_video.cpp:343 src/gui/setup_video.cpp:346
-#: src/gui/setup_video.cpp:573 src/gui/setup_video.cpp:716
-#: src/gui/setup_video.cpp:728
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr "w"
 
-#: src/gui/setup_video.cpp:494
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "切�到窗�模�，并��旧的模�，也没有失败�"
 
-#: src/gui/setup_video.cpp:500
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:511
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr "切�到全�"
 
-#: src/gui/setup_video.cpp:512
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "��生效"
 
-#: src/gui/setup_video.cpp:524
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr "切�到OpenGL"
 
-#: src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "�用改�为OpenGL需��新开始"
 
-#: src/gui/setup_video.cpp:618
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
-#: src/gui/setup_video.cpp:619
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:"
 
-#: src/gui/setup_video.cpp:635 src/gui/setup_video.cpp:640
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr "�幕分辨率已更改"
 
-#: src/gui/setup_video.cpp:638
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:674
-msgid "Particle Effect Settings Changed."
-msgstr "粒�效果更改的设置。"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Gui �明度"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "无文本"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "文本"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "气泡，无�"
 
-#: src/gui/setup_video.cpp:675
-msgid "Changes will take effect on map change."
-msgstr "�更会在地图更�时生效。"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "有�气泡"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "头顶文字"
+
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "关闭"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "低"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "高"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "环境音效"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "粒�效果"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "中"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "最大"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr "l"
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
 
 #: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
@@ -2704,9 +2765,9 @@ msgid "Skill %d"
 msgstr "技能为%d"
 
 #: src/gui/skilldialog.cpp:438
-#, fuzzy, c-format
+#, c-format
 msgid "Skill: %s, Id: %d"
-msgstr "技能为%d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
@@ -2719,7 +2780,7 @@ msgid "Lvl: %d (%+d)"
 msgstr "等级: %d（%+d）"
 
 #: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
-#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "帮会"
 
@@ -2751,7 +2812,7 @@ msgstr "离开公会？"
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你确定�离开工会%s�？"
 
-#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "t"
 
@@ -2923,139 +2984,139 @@ msgstr "选择n的�称。"
 msgid "Specials"
 msgstr "特价商�"
 
-#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:274
-#: src/gui/statuswindow.cpp:337
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "等级：%d"
 
-#: src/gui/statuswindow.cpp:145 src/gui/statuswindow.cpp:260
-#: src/gui/statuswindow.cpp:304
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "金�: %s"
 
-#: src/gui/statuswindow.cpp:151
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "HP："
 
-#: src/gui/statuswindow.cpp:158
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "�验："
 
-#: src/gui/statuswindow.cpp:172
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "MP："
 
-#: src/gui/statuswindow.cpp:204 src/gui/statuswindow.cpp:387
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "�业：%d"
 
-#: src/gui/statuswindow.cpp:205
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "�业："
 
-#: src/gui/statuswindow.cpp:263 src/gui/statuswindow.cpp:311
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr "角色�用点: %d"
 
-#: src/gui/statuswindow.cpp:269
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr "级别:%d (GM %d)"
 
-#: src/gui/statuswindow.cpp:325
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr "没有目标"
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr "生活魔术"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr "战魔"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr "蜕�魔术"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr "大自然的神奇"
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr "星芒魔术"
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr "命令编辑器"
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr "魔术"
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr "其他"
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr "符�："
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr "命令："
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:203
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr "法力："
 
-#: src/gui/textcommandeditor.cpp:209
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr "目标类型："
 
-#: src/gui/textcommandeditor.cpp:215
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr "图示："
 
-#: src/gui/textcommandeditor.cpp:221
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr "魔法等级："
 
-#: src/gui/textcommandeditor.cpp:227
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr "魔法学院："
 
-#: src/gui/textcommandeditor.cpp:233
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr "学校层次："
 
-#: src/gui/textcommandeditor.cpp:238
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr "�存"
 
@@ -3283,7 +3344,7 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:608
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr "�在线 - 更新"
 
@@ -3291,15 +3352,15 @@ msgstr "�在线 - 更新"
 msgid "Update"
 msgstr "æ›´æ–°"
 
-#: src/gui/whoisonline.cpp:194
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr "�在线 -"
 
-#: src/gui/whoisonline.cpp:622
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr "�在线 - 错误"
 
-#: src/gui/whoisonline.cpp:661
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr "�在线 - 更新"
 
@@ -3364,8 +3425,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "该命令使<昵称>�为频�管�员。"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
-#: src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<昵称>之间有空格，用�引�(\")括起�。"
 
@@ -3403,38 +3464,38 @@ msgstr "%s 全局公告："
 msgid "%s whispers: %s"
 msgstr "%s�语:%s"
 
-#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
-#: src/net/ea/gui/partytab.cpp:83
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
 msgid "Command: /invite <nick>"
 msgstr "命令：/invite <昵称>"
 
-#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
-#: src/net/ea/gui/partytab.cpp:90
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
 msgid "Command: /leave"
 msgstr "命令：/leave"
 
-#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
-#: src/net/ea/gui/partytab.cpp:69
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
 msgid "/help > Display this help."
 msgstr "/help > 显示该帮助信�。"
 
-#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
 msgid "/invite > Invite a player to your guild"
 msgstr "/invite > "
 
-#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
 msgid "/leave > Leave the guild you are in"
 msgstr "/leave > "
 
-#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
 msgid "/kick > Kick some one from the guild you are in"
 msgstr "/kick >"
 
@@ -3574,865 +3635,864 @@ msgstr "仓库"
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
 msgid "Basic Keys"
 msgstr "基本按键"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "�上移动"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "�下移动"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "�左移动"
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "��移动"
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "对准并攻击"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr "移动到目标"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr "更改移动到目标类型"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr "移动到首页�置"
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr "设为首页�置"
 
-#: src/keyboardconfig.cpp:60
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr "移动导航点"
 
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "�止攻击"
 
-#: src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:67
 msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr "目标最接近"
 
-#: src/keyboardconfig.cpp:68
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "目标NPC"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "目标玩家"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "�起"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr "更改皮�型"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "��窗�"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "�下"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "�幕快照"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "开�/关闭交易"
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr "更改地图�览模�"
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84
 msgid "Select OK"
 msgstr "选择OK"
 
-#: src/keyboardconfig.cpp:85
+#: src/keyboardconfig.cpp:87
 msgid "Shortcuts Keys"
 msgstr "快�按键"
 
-#: src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr "项目的快�键"
 
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
-#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
-#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
-#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:110
-#: src/keyboardconfig.cpp:112 src/keyboardconfig.cpp:114
-#: src/keyboardconfig.cpp:116 src/keyboardconfig.cpp:119
-#: src/keyboardconfig.cpp:121 src/keyboardconfig.cpp:123
-#: src/keyboardconfig.cpp:125 src/keyboardconfig.cpp:127
-#: src/keyboardconfig.cpp:379
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物�快� %d"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:130
 msgid "Windows Keys"
 msgstr "窗�按键"
 
-#: src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "帮助窗�"
 
-#: src/keyboardconfig.cpp:131
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "状�窗�"
 
-#: src/keyboardconfig.cpp:133
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "物��窗�"
 
-#: src/keyboardconfig.cpp:135
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "装备窗�"
 
-#: src/keyboardconfig.cpp:137
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "技能窗�"
 
-#: src/keyboardconfig.cpp:139
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "�地图窗�"
 
-#: src/keyboardconfig.cpp:141
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "�天窗�"
 
-#: src/keyboardconfig.cpp:143
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "物�快�窗�"
 
-#: src/keyboardconfig.cpp:145
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "设置窗�"
 
-#: src/keyboardconfig.cpp:147
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "Debug窗�"
 
-#: src/keyboardconfig.cpp:149
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr "社会窗�"
 
-#: src/keyboardconfig.cpp:151
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "表情快�窗�"
 
-#: src/keyboardconfig.cpp:153
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr "套装窗�"
 
-#: src/keyboardconfig.cpp:155
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr "橱窗"
 
-#: src/keyboardconfig.cpp:157
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr "快速下拉窗�"
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr "�敌统计窗�"
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr "命令的窗�"
 
-#: src/keyboardconfig.cpp:163
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr "挂机检查窗�"
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr "�是在线窗�"
 
-#: src/keyboardconfig.cpp:168
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr "你知��窗�"
 
-#: src/keyboardconfig.cpp:171
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr "上一页社会标签"
 
-#: src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:175
+#: src/keyboardconfig.cpp:177
 msgid "Emotes Keys"
 msgstr "表情按键"
 
-#: src/keyboardconfig.cpp:176
+#: src/keyboardconfig.cpp:178
 msgid "Smilie"
 msgstr "笑脸"
 
-#: src/keyboardconfig.cpp:177 src/keyboardconfig.cpp:179
-#: src/keyboardconfig.cpp:181 src/keyboardconfig.cpp:183
-#: src/keyboardconfig.cpp:185 src/keyboardconfig.cpp:187
-#: src/keyboardconfig.cpp:189 src/keyboardconfig.cpp:191
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:202 src/keyboardconfig.cpp:204
-#: src/keyboardconfig.cpp:206 src/keyboardconfig.cpp:208
-#: src/keyboardconfig.cpp:210 src/keyboardconfig.cpp:212
-#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:216
-#: src/keyboardconfig.cpp:218 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:222 src/keyboardconfig.cpp:224
-#: src/keyboardconfig.cpp:226 src/keyboardconfig.cpp:229
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:235
-#: src/keyboardconfig.cpp:237 src/keyboardconfig.cpp:239
-#: src/keyboardconfig.cpp:241 src/keyboardconfig.cpp:243
-#: src/keyboardconfig.cpp:245 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:256
-#: src/keyboardconfig.cpp:258 src/keyboardconfig.cpp:260
-#: src/keyboardconfig.cpp:262 src/keyboardconfig.cpp:264
-#: src/keyboardconfig.cpp:266 src/keyboardconfig.cpp:268
-#: src/keyboardconfig.cpp:270 src/keyboardconfig.cpp:272
-#: src/keyboardconfig.cpp:274 src/keyboardconfig.cpp:276
-#: src/keyboardconfig.cpp:374
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情快�键为 %d"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:280
 msgid "Outfits Keys"
 msgstr "套装按键"
 
-#: src/keyboardconfig.cpp:279
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr "装备套装"
 
-#: src/keyboardconfig.cpp:281
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:283
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:285
+#: src/keyboardconfig.cpp:287
 msgid "Chat Keys"
 msgstr "�天按键"
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "切��天"
 
-#: src/keyboardconfig.cpp:288
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "�上滚动�天记录"
 
-#: src/keyboardconfig.cpp:290
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "�下滚动�天记录"
 
-#: src/keyboardconfig.cpp:292
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "上一个�天窗�标签页"
 
-#: src/keyboardconfig.cpp:294
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "下一个�天窗�标签页"
 
-#: src/keyboardconfig.cpp:297
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr "关闭当��天标签"
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr "自动完�交谈"
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr "�用�天输入"
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:309
 msgid "Other Keys"
 msgstr "其他按键"
 
-#: src/keyboardconfig.cpp:308
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "忽略输入1"
 
-#: src/keyboardconfig.cpp:310
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "忽略输入2"
 
-#: src/keyboardconfig.cpp:312
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr "直接�上"
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr "直接下"
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr "直接离开"
 
-#: src/keyboardconfig.cpp:316
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr "直接对"
 
-#: src/keyboardconfig.cpp:318
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr "疯狂移动"
 
-#: src/keyboardconfig.cpp:320
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr "更改疯狂移动模�"
 
-#: src/keyboardconfig.cpp:322
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:324
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr "快速下���项目"
 
-#: src/keyboardconfig.cpp:326
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:328
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr "快速愈�的目标或自我"
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:332
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr "使用魔法攻击"
 
-#: src/keyboardconfig.cpp:334
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr "切�魔法攻击"
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:339
 msgid "Switch pvp attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:338
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr "更改移动类型"
 
-#: src/keyboardconfig.cpp:340
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr "更改攻击型武器"
 
-#: src/keyboardconfig.cpp:342
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr "更改攻击类型"
 
-#: src/keyboardconfig.cpp:344
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr "更改跟�模�"
 
-#: src/keyboardconfig.cpp:346
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr "更改仿模�"
 
-#: src/keyboardconfig.cpp:349
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:350
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr "开/关 音频"
 
-#: src/keyboardconfig.cpp:352
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr "�用/�用离开模�"
 
-#: src/keyboardconfig.cpp:354
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr "从键盘模拟�键�击"
 
-#: src/keyboardconfig.cpp:356
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr "切�模�"
 
-#: src/keyboardconfig.cpp:358
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr "修改按键"
 
-#: src/keyboardconfig.cpp:437
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:386
+#: src/localplayer.cpp:381
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr "项目是太�了。"
 
-#: src/localplayer.cpp:1447
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr "物�太远了。"
 
-#: src/localplayer.cpp:1450
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1453
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1456
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1459
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1483
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:1719
-#, fuzzy
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
 msgid "xp"
-msgstr "�验："
+msgstr ""
 
-#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1907
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1912
+#: src/localplayer.cpp:1908
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1913
+#: src/localplayer.cpp:1909
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1914
+#: src/localplayer.cpp:1910
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1915
+#: src/localplayer.cpp:1911
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1916
+#: src/localplayer.cpp:1912
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1934
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1939
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1943
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1957
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1958
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1959
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1960
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1965
+#: src/localplayer.cpp:1961
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1966
+#: src/localplayer.cpp:1962
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1967
+#: src/localplayer.cpp:1963
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1968
+#: src/localplayer.cpp:1964
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1969
+#: src/localplayer.cpp:1965
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/localplayer.cpp:1988
+#: src/localplayer.cpp:1984
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1989
+#: src/localplayer.cpp:1985
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1990
+#: src/localplayer.cpp:1986
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1991
+#: src/localplayer.cpp:1987
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1992
+#: src/localplayer.cpp:1988
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2013
+#: src/localplayer.cpp:2009
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2014
+#: src/localplayer.cpp:2010
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2035
+#: src/localplayer.cpp:2031
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/localplayer.cpp:2036
+#: src/localplayer.cpp:2032
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2037
+#: src/localplayer.cpp:2033
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2071
+#: src/localplayer.cpp:2085
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2072
+#: src/localplayer.cpp:2086
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2087
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2088
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2089
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2090
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2091
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2092
 msgid "(?) pick up"
 msgstr "(?)æ‹¿èµ·"
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2105
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2092
+#: src/localplayer.cpp:2106
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2093
+#: src/localplayer.cpp:2107
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2094
+#: src/localplayer.cpp:2108
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2095
+#: src/localplayer.cpp:2109
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2096
+#: src/localplayer.cpp:2110
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2115
+#: src/localplayer.cpp:2129
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2116
+#: src/localplayer.cpp:2130
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2117
+#: src/localplayer.cpp:2131
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2118
+#: src/localplayer.cpp:2132
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2119
+#: src/localplayer.cpp:2133
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2120
+#: src/localplayer.cpp:2134
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2139
+#: src/localplayer.cpp:2153
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2140
+#: src/localplayer.cpp:2154
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2141
+#: src/localplayer.cpp:2155
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2142
-msgid "(d) dont attack players"
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2143
+#: src/localplayer.cpp:2157
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2162
+#: src/localplayer.cpp:2176
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2163
+#: src/localplayer.cpp:2177
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2164
+#: src/localplayer.cpp:2178
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2192
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr "�离"
 
-#: src/localplayer.cpp:2211
+#: src/localplayer.cpp:2226
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2212
+#: src/localplayer.cpp:2227
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2213 src/localplayer.cpp:2228
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2241
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2227
+#: src/localplayer.cpp:2242
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2252
+#: src/localplayer.cpp:2267
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2253
+#: src/localplayer.cpp:2268
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2254
+#: src/localplayer.cpp:2269
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3772
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr "跟�:"
 
-#: src/localplayer.cpp:3774 src/localplayer.cpp:3789
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3781
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3783 src/localplayer.cpp:3791
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4139
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr "你看"
 
-#: src/main.cpp:51
+#: src/main.cpp:55
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:56
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:58
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:59
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "选项："
 
-#: src/main.cpp:58
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr "-l--log-file 日志文件"
 
-#: src/main.cpp:59
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr "-v --version: 显示版本"
 
-#: src/main.cpp:61
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr "--update-host:    使用此更新主机"
 
-#: src/main.cpp:69
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:81
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4669,43 +4729,43 @@ msgstr ""
 msgid "%s has kicked from your guild."
 msgstr "%s已�被工会开除."
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr "/invite > 邀请�一玩家加入您的帮会"
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > 离开你所在的帮会"
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr "/kick > 把�人踢出你所在的帮会"
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > 显示/改�帮会项目共享选项"
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr "/exp > 显示/改�帮会�验共享选项"
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr "该命令邀请<昵称>和你�会。"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr "该命令致使玩家离开帮会"
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr "命令：/item <策略>"
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr "改命令改�帮会的物�共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
@@ -4713,23 +4773,23 @@ msgstr ""
 "<策略>�以为“1�，“yes�，“true�其中一以开�物�共享，或者 是\"0\",\"no\","
 "\"false\"用��止物�共享。"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr "命令：/item"
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr "该命令显示帮会现有的物�共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr "命令：/exp <策略>"
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr "该命令改�帮会的�验共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -4737,43 +4797,43 @@ msgstr ""
 "<策略>�以为“1�，“yes�，“true�其中之一以开��验共享，或者 是\"0\",\"no\","
 "\"false\"用�关闭�验共享。"
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr "命令：/exp"
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr "该命令显示帮会现有的�验共享策略。"
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:285
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr "物�共享开�。"
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:295
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr "物�共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:305
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr "物�共享��能。"
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:247
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr "�验共享开�。"
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:257
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr "�验共享关闭。"
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:267
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr "�验共享��能。"
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
@@ -4850,186 +4910,186 @@ msgstr ""
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr "无法创建帮会。"
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr "帮会创建�功。"
 
-#: src/net/ea/partyhandler.cpp:138
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s已�加入你的党。"
 
-#: src/net/ea/partyhandler.cpp:174
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s已�是你的帮会�员了。"
 
-#: src/net/ea/partyhandler.cpp:179
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s拒�了您的邀请。"
 
-#: src/net/ea/partyhandler.cpp:184
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s现在是你帮会中的�员了。"
 
-#: src/net/ea/partyhandler.cpp:189
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s�能加入团队，因为团队�员已满。"
 
-#: src/net/ea/partyhandler.cpp:194
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:358
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr "你以退出帮会"
 
-#: src/net/ea/partyhandler.cpp:371
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr "%s已�离开你的帮会。"
 
-#: src/net/ea/partyhandler.cpp:448
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "一未知�员�试说：%s"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "你已玩完了。"
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "很�憾的告诉您，您的角色在战斗中死亡了"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "你�也�是那样的生机勃勃了。"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "游�结��"
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr "投入游��继续。"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "�，孩�。你的角色没有真正死亡。他……呃……�过是去了一个更好的地方而已。"
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "我猜这进行得并�顺利。"
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "被消�了。"
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr "你还没死，你�是在休�"
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 "<策略>�以为“1�，“yes�，“true�其中之一以开�物�共享，或者 是\"0\",\"no\","
 "\"false\"用��止物�共享。"
 
-#: src/net/ea/playerhandler.cpp:335 src/net/ea/playerhandler.cpp:345
-#: src/net/ea/playerhandler.cpp:427
+#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr "讯�"
 
-#: src/net/ea/playerhandler.cpp:336
+#: src/net/ea/playerhandler.cpp:337
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已�带超过�数负�。无法回��康（体力）"
 
-#: src/net/ea/playerhandler.cpp:346
+#: src/net/ea/playerhandler.cpp:347
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -5613,24 +5673,24 @@ msgstr "无法解�主机“"
 msgid "Connection to server terminated. "
 msgstr "连接到�务器终止。"
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s�在你的帮会中�"
 
-#: src/playerrelations.cpp:479
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:499
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:543
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:546
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr "�动的泡沫"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 856c92b9a..0faa9bd9a 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,335 +18,359 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr "顯示"
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "�明指令"
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr ""
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -354,23 +379,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "�字"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -378,79 +404,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr ""
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr ""
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "離開"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr ""
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "出售"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "�消"
 
@@ -486,7 +516,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "密碼："
@@ -513,81 +543,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "新增角色"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "�字："
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "創造"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "男生"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "女生"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分�%d點數"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的�字至少需�4個字元"
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "確�刪除角色"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr ""
 
@@ -595,120 +630,122 @@ msgstr ""
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "註冊"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "�%s竊竊�語：%s"
@@ -721,506 +758,551 @@ msgstr "是"
 msgid "No"
 msgstr "�"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "確定"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "Port："
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "�備"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "�下�備"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
-msgstr "物�攔"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr "物�攔"
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "�備"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丟棄"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "請�擇交易的物�數�"
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "請�擇丟棄的物�數�"
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "請�擇你�分離的物�數�"
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "登入"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "伺�器："
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "註冊"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
+#: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -1233,345 +1315,382 @@ msgstr ""
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "玩家"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "交�伺�器"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "交�角色"
 
@@ -1615,200 +1734,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr "Port："
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "增加"
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
-msgstr "請輸入伺�氣得IP地�和Port"
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "音效"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "音效"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "音效音�"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "音樂音�"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr ""
@@ -1856,41 +2014,41 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "確定"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "�置視窗"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "按下按鈕開始矯正"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "矯正"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "啟用�桿"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "�桿"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "�止"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "旋轉手柄"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1912,360 +2070,460 @@ msgstr "�設"
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按���。"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "玩家"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "關係"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "好�"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "�許交易"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "�許密語"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "當忽略時："
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -2281,408 +2539,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
+#: src/gui/setup_video.cpp:227
+msgid "Full screen"
+msgstr "全螢幕"
+
+#: src/gui/setup_video.cpp:228
+msgid "Custom cursor"
+msgstr "自訂滑鼠標"
+
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
-msgid "Text"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:232
+msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "關閉"
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
+msgid "None"
+msgstr ""
 
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "低"
+#: src/gui/setup_video.cpp:378
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "高"
+#: src/gui/setup_video.cpp:384
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr ""
 
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "中"
+#: src/gui/setup_video.cpp:395
+msgid "Switching to Full Screen"
+msgstr ""
 
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "最大"
+#: src/gui/setup_video.cpp:396
+msgid "Restart needed for changes to take effect."
+msgstr "請�新啟動"
 
-#: src/gui/setup_video.cpp:288
-msgid "Full screen"
-msgstr "全螢幕"
+#: src/gui/setup_video.cpp:408
+msgid "Changing to OpenGL"
+msgstr ""
 
-#: src/gui/setup_video.cpp:289
-msgid "Custom cursor"
-msgstr "自訂滑鼠標"
+#: src/gui/setup_video.cpp:409
+msgid "Applying change to OpenGL requires restart."
+msgstr "確�切�OpenGL需��新開始"
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:484
+msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:485
+msgid "Enter new resolution:                "
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
+#: src/gui/setup_video.cpp:504
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:302
-msgid "FPS limit:"
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
-msgid "Alt FPS limit: "
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "顯示"
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
 
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:322
+#: src/gui/setup_visual.cpp:53
 msgid "Gui opacity"
 msgstr "Gui �明度"
 
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr ""
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
-msgid "None"
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
-msgid "Switching to Full Screen"
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
-msgid "Restart needed for changes to take effect."
-msgstr "請�新啟動"
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "關閉"
 
-#: src/gui/setup_video.cpp:514
-msgid "Changing to OpenGL"
-msgstr ""
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "低"
 
-#: src/gui/setup_video.cpp:515
-msgid "Applying change to OpenGL requires restart."
-msgstr "確�切�OpenGL需��新開始"
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "高"
 
-#: src/gui/setup_video.cpp:602
-msgid "Custom resolution (example: 1024x768)"
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
-msgid "Enter new resolution:                "
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
-msgid "Screen Resolution Changed"
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "中"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "最大"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
-msgid "Some windows may be moved to fit the lowered resolution."
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:89
+msgid "on"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr "增加"
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr "�級"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2690,502 +2981,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "�業：%d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3209,60 +3137,60 @@ msgstr ""
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
+msgstr ""
+
+#: src/gui/tradewindow.cpp:454
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物�失敗。你�能覆蓋視窗中的該類物�能。"
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr ""
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "�字：%s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "更新中..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "開始"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "已完�"
 
@@ -3414,23 +3342,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3495,7 +3423,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
 
@@ -3533,6 +3462,41 @@ msgstr "%s 主�公告："
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3662,556 +3626,872 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
+#: src/keyboardconfig.cpp:65
+msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:63
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
 msgstr ""
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr ""
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4227,142 +4507,130 @@ msgstr ""
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4396,418 +4664,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4821,160 +5085,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "力�"
 
@@ -4983,7 +5247,7 @@ msgstr "力�"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "��"
 
@@ -4992,7 +5256,7 @@ msgstr "��"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "閃躲"
 
@@ -5001,7 +5265,7 @@ msgstr "閃躲"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "體力"
 
@@ -5010,7 +5274,7 @@ msgstr "體力"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "智力"
 
@@ -5280,41 +5544,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5322,129 +5586,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr "和伺�器失去連線"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "幸�"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr ""
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr ""
-
-
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6b621f8f2..be125b2f3 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-02-29 00:17+0300\n"
+"PO-Revision-Date: 2012-02-28 21:32+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,335 +18,359 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1168
 msgid "Visible on map"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:343
+msgid "Human"
+msgstr ""
+
+#: src/being.cpp:560
 msgid "dodge"
 msgstr ""
 
-#: src/being.cpp:542
+#: src/being.cpp:560
 msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1542 src/gui/whoisonline.cpp:764
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1547 src/gui/whoisonline.cpp:769
 msgid "I"
 msgstr ""
 
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:973 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "設定"
 
-#: src/client.cpp:908
+#: src/client.cpp:980 src/gui/setup_perfomance.cpp:47
+msgid "Perfomance"
+msgstr ""
+
+#: src/client.cpp:985 src/gui/setup_video.cpp:239
+msgid "Video"
+msgstr "顯示"
+
+#: src/client.cpp:990
+msgid "Themes"
+msgstr ""
+
+#: src/client.cpp:1072
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:939
+#: src/client.cpp:1104
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:972
+#: src/client.cpp:1138
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1072
+#: src/client.cpp:1242
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1103
+#: src/client.cpp:1277
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1113
+#: src/client.cpp:1287
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1330 src/client.cpp:1338 src/client.cpp:1473
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
-#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
-#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
+#: src/gui/charcreatedialog.cpp:272 src/gui/charselectdialog.cpp:256
+#: src/gui/editserverdialog.cpp:174 src/gui/register.cpp:228
+#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
+#: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "錯誤"
 
-#: src/client.cpp:1166
+#: src/client.cpp:1348
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1374
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1375
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1213
+#: src/client.cpp:1394
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1395
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1234
+#: src/client.cpp:1415
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1235
+#: src/client.cpp:1416
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1635 src/client.cpp:1668 src/client.cpp:1683
+#: src/client.cpp:2114 src/client.cpp:2121
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1629
+#: src/client.cpp:1821
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1855 src/client.cpp:1861
 msgid "Error creating updates directory!"
 msgstr "建立更新目錄失敗�"
 
-#: src/client.cpp:1690
+#: src/client.cpp:1882
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:215
 msgid "Unknown command."
 msgstr "�明指令"
 
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:335
 msgid "Cannot send empty whispers!"
 msgstr "傳�密語失敗"
 
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:349
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
 " you."
 msgstr "�能以�稱 \"%s\" 創建一個密語標籤! 該�稱已存在或�方是你."
 
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:369
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "�求�加頻� %s"
 
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:385 src/net/ea/gui/partytab.cpp:126
 msgid "Party name is missing."
 msgstr "�掉隊��稱。"
 
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:396
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:409 src/commandhandler.cpp:526
+#: src/commandhandler.cpp:567 src/commandhandler.cpp:607
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Return toggles chat."
 msgstr "\"ENTER\"切��天"
 
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:460
 msgid "Message closes chat."
 msgstr "關閉密語"
 
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:471
 msgid "Return now toggles chat."
 msgstr "\"ENTER\"切��天"
 
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:477
 msgid "Message now closes chat."
 msgstr "切��天"
 
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:505
 msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:510
 msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:515
 msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:534
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:548
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:556
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:579
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:586
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:588
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:594
+msgid "blacklisted"
+msgstr ""
+
+#: src/commandhandler.cpp:599
+msgid "enemy"
+msgstr ""
+
+#: src/commandhandler.cpp:614
 msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:625
 msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:627
 msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:940 src/commandhandler.cpp:986
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:950
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:959
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:967
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1062
 msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1074
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1078
 msgid "Created:"
 msgstr ""
 
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1080
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1245 src/commandhandler.cpp:1252
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1247 src/commandhandler.cpp:1254
 msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:40
+#: src/commandhandler.h:34
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s 的�項�以是 \"yes\"�\"no\"�\"true\"�\"false\"�\"1\"�\"0\"。"
 
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:256 src/gui/widgets/chattab.cpp:425
 msgid "General"
 msgstr "一般"
 
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:260 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:427
 msgid "Debug"
 msgstr ""
 
-#: src/game.cpp:475
+#: src/game.cpp:512
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:483
+#: src/game.cpp:520
 msgid "Saving screenshot failed!"
 msgstr "儲存抓圖失敗!"
 
-#: src/game.cpp:523
+#: src/game.cpp:562
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:537
+#: src/game.cpp:563
 msgid "Network Error"
 msgstr "網路錯誤"
 
-#: src/game.cpp:1184
+#: src/game.cpp:1275
 msgid "Ignoring incoming trade requests"
 msgstr "忽略收到的交易�求"
 
-#: src/game.cpp:1191
+#: src/game.cpp:1285
 msgid "Accepting incoming trade requests"
 msgstr "接�收到的交易�求"
 
-#: src/game.cpp:1576
+#: src/game.cpp:1799
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:1577
+#: src/game.cpp:1800
 #, c-format
 msgid "Error while loading %s"
 msgstr "載入 %s 時發生錯誤"
 
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
 #, c-format
 msgid "Guild: %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
 #, c-format
 msgid "Pvp rank: %d"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
 #, c-format
 msgid "Comment: %s"
 msgstr ""
@@ -354,23 +379,24 @@ msgstr ""
 msgid "Bot Checker"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
 msgid "Name"
 msgstr "�字"
 
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:138
+#: src/gui/popupmenu.cpp:308 src/gui/popupmenu.cpp:673
+#: src/keyboardconfig.cpp:51 src/net/tmwa/generalhandler.cpp:272
 msgid "Attack"
 msgstr "攻擊"
 
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
-#: src/keyboardconfig.cpp:62
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
+#: src/keyboardconfig.cpp:64
 msgid "Talk"
 msgstr "說話"
 
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:269
+#: src/gui/popupmenu.cpp:301 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:739 src/gui/popupmenu.cpp:826
 msgid "Move"
 msgstr ""
 
@@ -378,79 +404,83 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
 msgid "Reset"
 msgstr "�設"
 
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:281
+#: src/gui/popupmenu.cpp:298 src/gui/popupmenu.cpp:751
 msgid "Buy"
 msgstr "購買"
 
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "價格: %s / 總共: %s"
 
+#: src/gui/buydialog.cpp:103
+msgid "Amount:"
+msgstr ""
+
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:776
 msgid "+"
 msgstr "增加"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:788
 msgid "-"
 msgstr "減少"
 
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
-#: src/keyboardconfig.cpp:290
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:261
+#: src/keyboardconfig.cpp:86
 msgid "Quit"
 msgstr "離開"
 
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:521 src/gui/statuswindow.cpp:576
+#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:806
 msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:141
 msgid "Shop"
 msgstr "商店"
 
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:282
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:752
 #: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
 msgid "Sell"
 msgstr "出售"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
-#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:124
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:79
+#: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
+#: src/gui/popupmenu.cpp:349 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:523 src/gui/popupmenu.cpp:551
+#: src/gui/popupmenu.cpp:577 src/gui/popupmenu.cpp:593
+#: src/gui/popupmenu.cpp:614 src/gui/popupmenu.cpp:842
+#: src/gui/popupmenu.cpp:868 src/gui/popupmenu.cpp:1851
+#: src/gui/popupmenu.cpp:1881 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:1986 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:2064 src/gui/popupmenu.cpp:2118
+#: src/gui/popupmenu.cpp:2140 src/gui/quitdialog.cpp:55
+#: src/gui/register.cpp:82 src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1199
+#: src/gui/textcommandeditor.cpp:240 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:169
 msgid "Cancel"
 msgstr "�消"
 
@@ -486,7 +516,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "變更密碼"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:97
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "密碼："
@@ -513,81 +543,86 @@ msgstr ""
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:58
-msgid "Create Character"
-msgstr "新增角色"
+#: src/gui/charcreatedialog.cpp:70
+msgid "New Character"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
-#: src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:99 src/gui/editserverdialog.cpp:61
+#: src/gui/logindialog.cpp:96 src/gui/register.cpp:75
 msgid "Name:"
 msgstr "�字："
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:102 src/gui/charcreatedialog.cpp:108
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:117
+#: src/gui/outfitwindow.cpp:85
 msgid ">"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:105 src/gui/charcreatedialog.cpp:109
+#: src/gui/charcreatedialog.cpp:118 src/gui/outfitwindow.cpp:84
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:106
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:110
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:112
+msgid "^"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:119
 msgid "Race:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:123 src/gui/charselectdialog.cpp:483
+#: src/gui/socialwindow.cpp:1261
 msgid "Create"
 msgstr "創造"
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:125 src/gui/register.cpp:98
 msgid "Male"
 msgstr "男生"
 
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:126 src/gui/register.cpp:99
 msgid "Female"
 msgstr "女生"
 
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:144 src/gui/charcreatedialog.cpp:368
 #, c-format
 msgid "Please distribute %d points"
 msgstr "請分�%d點數"
 
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:273
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的�字至少需�4個字元"
 
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:359
 msgid "Character stats OK"
 msgstr "角色狀態確定"
 
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:373
 #, c-format
 msgid "Please remove %d points"
 msgstr "請移除%d點數"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
 msgid "Confirm Character Delete"
 msgstr "確�刪除角色"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
 msgid "Are you sure you want to delete this character?"
 msgstr "你確定想刪除這個角色？"
 
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
 msgid "Account and Character Management"
 msgstr "帳號與角色管�"
 
@@ -595,120 +630,122 @@ msgstr "帳號與角色管�"
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
 #: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
 msgstr "�消註冊"
 
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:163
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:256
 msgid "Incorrect password"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password for deleting character"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:289
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
+#: src/gui/setup_relations.cpp:247 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:243
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:471
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:474
 #, c-format
 msgid "Level %d"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:485 src/gui/charselectdialog.cpp:486
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:116 src/gui/inventorywindow.cpp:70
+#: src/gui/setup_visual.cpp:87
 msgid "default"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:113
+#: src/gui/chatwindow.cpp:117
 msgid "black"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:114
+#: src/gui/chatwindow.cpp:118
 msgid "red"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:115
+#: src/gui/chatwindow.cpp:119
 msgid "green"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:116
+#: src/gui/chatwindow.cpp:120
 msgid "blue"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:117
+#: src/gui/chatwindow.cpp:121
 msgid "gold"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:118
+#: src/gui/chatwindow.cpp:122
 msgid "yellow"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:123
 msgid "pink"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:124
 msgid "purple"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:125
 msgid "grey"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:126
 msgid "brown"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:127
 msgid "rainbow 1"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:128
 msgid "rainbow 2"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:129
 msgid "rainbow 3"
 msgstr ""
 
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:146 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
+#: src/gui/setup_relations.cpp:225 src/gui/setup_theme.cpp:102
+#: src/gui/setup_theme.cpp:148 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:101 src/gui/textcommandeditor.cpp:140
+#: src/gui/textcommandeditor.cpp:159
 msgid "???"
 msgstr "???"
 
-#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
+#: src/gui/chatwindow.cpp:156 src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "�天"
 
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:654
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:1041
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "�%s竊竊�語：%s"
@@ -721,506 +758,551 @@ msgstr "是"
 msgid "No"
 msgstr "�"
 
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:151
+#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:168
+#: src/gui/popupmenu.cpp:176 src/gui/popupmenu.cpp:414
+#: src/gui/popupmenu.cpp:422 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:450 src/gui/popupmenu.cpp:685
+#: src/gui/popupmenu.cpp:693 src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:716
 msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
+#: src/gui/setup_other.cpp:63
 msgid "Map"
 msgstr "地圖"
 
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
 msgid "Target"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
 msgid "Net"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
 msgid "Music:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
 msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
 msgid "Minimap:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
 msgid "Cursor:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
 msgid "Player Position:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
 msgid "Particle count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
 msgid "Map actors count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
 #, c-format
 msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
 #, c-format
 msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
 #, c-format
 msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
 msgid "Textures count:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:303
+#: src/gui/debugwindow.cpp:350
 msgid "Target:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:351
 msgid "Target Id:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
-msgid "Target Level:"
+#: src/gui/debugwindow.cpp:272
+msgid "Target level:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
-msgid "Target Party:"
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:321
+msgid "Target race:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
-msgid "Target Guild:"
+#: src/gui/debugwindow.cpp:274
+msgid "Target party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:275
+msgid "Target guild:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:340
+#: src/gui/debugwindow.cpp:345 src/gui/debugwindow.cpp:355
 msgid "Attack delay:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:330
+#: src/gui/debugwindow.cpp:356
 msgid "Minimal hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:332
+#: src/gui/debugwindow.cpp:357
 msgid "Maximum hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:279 src/gui/debugwindow.cpp:334
+#: src/gui/debugwindow.cpp:358
 msgid "Critical hit:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:312 src/gui/debugwindow.cpp:317
+#: src/gui/debugwindow.cpp:352
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:323 src/gui/debugwindow.cpp:353
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:326 src/gui/debugwindow.cpp:354
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:392 src/gui/debugwindow.cpp:397
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:400
 #, c-format
 msgid "In: %d bytes/s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:402
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:47
+#: src/gui/didyouknowwindow.cpp:48
 msgid "Did You Know?"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:64 src/gui/helpwindow.cpp:60
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
+#: src/gui/popupmenu.cpp:631 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:65
 msgid "< Previous"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:66
 msgid "Next >"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:67
 msgid "Auto open this window"
 msgstr ""
 
-#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:78
+#: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
+#: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
 msgstr "確定"
 
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/editserverdialog.cpp:54
+msgid "Edit Server"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:62
+msgid "Address:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:63
+msgid "Port:"
+msgstr "端�(port):"
+
+#: src/gui/editserverdialog.cpp:64
+msgid "Server type:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:65
+msgid "Description:"
+msgstr ""
+
+#: src/gui/editserverdialog.cpp:175
+msgid "Please at least type both the address and the port of the server."
+msgstr ""
+
+#: src/gui/equipmentwindow.cpp:64 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "�備"
 
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:99 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:545 src/gui/inventorywindow.cpp:554
+#: src/gui/popupmenu.cpp:1813 src/gui/popupmenu.cpp:1909
+#: src/gui/popupmenu.cpp:1956
 msgid "Unequip"
 msgstr "�下�備"
 
-#: src/gui/helpwindow.cpp:43
+#: src/gui/helpwindow.cpp:44
 msgid "Help"
 msgstr "說明"
 
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
-msgid "Inventory"
-msgstr "物�攔"
-
-#: src/gui/inventorywindow.cpp:104
-msgid "Slots:"
-msgstr "欄�:"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:115
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:116
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:122
-msgid "na"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:123
-msgid "az"
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124
-msgid "id"
+#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
+msgstr "物�攔"
+
+#: src/gui/inventorywindow.cpp:137
+msgid "Slots:"
+msgstr "欄�:"
+
+#: src/gui/inventorywindow.cpp:149
+msgid "Filter:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:547
+#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1815
+#: src/gui/popupmenu.cpp:1911 src/gui/popupmenu.cpp:1958
 msgid "Equip"
 msgstr "�備"
 
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
+#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1819
+#: src/gui/popupmenu.cpp:1876 src/gui/popupmenu.cpp:1915
+#: src/gui/popupmenu.cpp:1962
 msgid "Use"
 msgstr "使用"
 
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:652
+#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1967
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1929 src/gui/popupmenu.cpp:1976
 msgid "Split"
 msgstr "分開"
 
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:589
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:178
 msgid "Weight:"
 msgstr "��:"
 
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:203 src/gui/inventorywindow.cpp:643
+#: src/gui/popupmenu.cpp:1799 src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:1979 src/gui/setup.cpp:74
 msgid "Store"
 msgstr "寄放"
 
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:204 src/gui/popupmenu.cpp:1840
 msgid "Retrieve"
 msgstr "�回"
 
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:654 src/gui/popupmenu.cpp:1829
+#: src/gui/popupmenu.cpp:1925 src/gui/popupmenu.cpp:1972
 #: src/gui/windowmenu.cpp:97
 msgid "Drop"
 msgstr "丟棄"
 
-#: src/gui/itemamountwindow.cpp:210
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "全部"
 
-#: src/gui/itemamountwindow.cpp:261
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
 msgstr "請�擇交易的物�數�"
 
-#: src/gui/itemamountwindow.cpp:264
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "請�擇丟棄的物�數�"
 
-#: src/gui/itemamountwindow.cpp:267
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
 msgstr "�擇�儲存的物�數�。"
 
-#: src/gui/itemamountwindow.cpp:270
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
 msgstr "�擇��回的物�數�。"
 
-#: src/gui/itemamountwindow.cpp:273
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "請�擇你�分離的物�數�"
 
-#: src/gui/itemamountwindow.cpp:276
+#: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:279
+#: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
 msgstr ""
 
-#: src/gui/itemamountwindow.cpp:282
+#: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
 msgstr ""
 
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
 msgid ", "
 msgstr ""
 
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
 msgid "Kill stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:66
 msgid "Reset stats"
 msgstr ""
 
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:67
 msgid "Reset timer"
 msgstr ""
 
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
 #, c-format
 msgid "Level: %d at %f%%"
 msgstr ""
 
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
 #, c-format
 msgid "Exp: %d/%d Left: %d"
 msgstr ""
 
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
 #, c-format
 msgid "1%% = %d exp, avg mob for 1%%: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
 #, c-format
 msgid "Kills: %s, total exp: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
 #, c-format
 msgid "Avg Exp: %s, No. of avg mob to next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
 #, c-format
 msgid "Kills/Min: %s, Exp/Min: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
 #, c-format
 msgid "Exp speed per %d min: %s"
 msgid_plural "Exp speed per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
 #, c-format
 msgid "Time for next level per %d min: %s"
 msgid_plural "Time for next level per %d min: %s"
 msgstr[0] ""
 
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
 msgid "Last kill exp:"
 msgstr ""
 
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
 msgid "Time before jacko spawn:"
 msgstr ""
 
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
 #, c-format
 msgid "  Time for next level: %s"
 msgstr ""
 
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:363
 #, c-format
 msgid "%s %d?"
 msgstr ""
 
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:369
 msgid "jacko spawning"
 msgstr ""
 
-#: src/gui/logindialog.cpp:59
-msgid "Normal"
+#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
+msgid "You have left the guild."
 msgstr ""
 
 #: src/gui/logindialog.cpp:60
-msgid "Auto Close"
+msgid "Normal"
 msgstr ""
 
 #: src/gui/logindialog.cpp:61
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/logindialog.cpp:62
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
+#: src/gui/logindialog.cpp:87 src/gui/logindialog.cpp:125
 msgid "Login"
 msgstr "登入"
 
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
-#: src/gui/widgets/chattab.cpp:173
+#: src/gui/logindialog.cpp:93 src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "伺�器："
 
-#: src/gui/logindialog.cpp:96
+#: src/gui/logindialog.cpp:98
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:112
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:111
+#: src/gui/logindialog.cpp:113
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:123 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "註冊"
 
-#: src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:124
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
 msgid "health bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
 msgid "mana bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
 msgid "experience bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
 msgid "job bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
 msgid "weight bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
 msgid "arrows bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
 msgid "status bar"
 msgstr ""
 
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
-msgid "Waiting for server"
-msgstr "等待伺�器中"
-
 #: src/gui/npcdialog.cpp:52
+msgid "Stop waiting"
+msgstr ""
+
+#: src/gui/npcdialog.cpp:53
 msgid "Next"
 msgstr "下一個"
 
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
 msgid "Submit"
 msgstr "確�"
 
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
+#: src/gui/setup_other.cpp:150
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:633
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:222
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "存至:"
@@ -1233,345 +1315,382 @@ msgstr "傳�"
 msgid "Failed to send as sender or letter invalid."
 msgstr "無法傳�的發件人或信�無效。"
 
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:547
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:549
+#: src/gui/windowmenu.cpp:302
 #, c-format
 msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
 msgid "Away outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:137 src/gui/popupmenu.cpp:672
 #: src/gui/widgets/tradetab.cpp:44
 msgid "Trade"
 msgstr "交易"
 
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:406
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:143 src/gui/popupmenu.cpp:677
 msgid "Heal"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:149 src/gui/popupmenu.cpp:412
+#: src/gui/popupmenu.cpp:683
 msgid "Be friend"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:150 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:175
+#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:421 src/gui/popupmenu.cpp:430
+#: src/gui/popupmenu.cpp:449 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:684 src/gui/popupmenu.cpp:692
+#: src/gui/popupmenu.cpp:701 src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:728
 msgid "Disregard"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:177 src/gui/popupmenu.cpp:415
+#: src/gui/popupmenu.cpp:423 src/gui/popupmenu.cpp:451
+#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
+#: src/gui/popupmenu.cpp:717
+msgid "Black list"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:416
+#: src/gui/popupmenu.cpp:424 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:687 src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:703
+msgid "Set as enemy"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:154 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:189
+#: src/gui/popupmenu.cpp:417 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:433 src/gui/popupmenu.cpp:439
+#: src/gui/popupmenu.cpp:444 src/gui/popupmenu.cpp:452
+#: src/gui/popupmenu.cpp:688 src/gui/popupmenu.cpp:696
+#: src/gui/popupmenu.cpp:704 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:718 src/gui/popupmenu.cpp:723
 msgid "Erase"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:188
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:429
+#: src/gui/popupmenu.cpp:437 src/gui/popupmenu.cpp:443
+#: src/gui/popupmenu.cpp:448 src/gui/popupmenu.cpp:456
+#: src/gui/popupmenu.cpp:700 src/gui/popupmenu.cpp:708
+#: src/gui/popupmenu.cpp:714 src/gui/popupmenu.cpp:722
+#: src/gui/popupmenu.cpp:727
 msgid "Unignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
-#: src/playerrelations.cpp:400
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:195
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:458
+#: src/gui/popupmenu.cpp:709 src/gui/popupmenu.cpp:729
+#: src/playerrelations.cpp:466
 msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:466
+#: src/gui/popupmenu.cpp:737 src/gui/popupmenu.cpp:816
 msgid "Follow"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:204 src/gui/popupmenu.cpp:467
+#: src/gui/popupmenu.cpp:738 src/gui/popupmenu.cpp:817
 msgid "Imitation"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:213 src/gui/popupmenu.cpp:770
 msgid "Invite to party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:218 src/gui/popupmenu.cpp:478
+#: src/gui/popupmenu.cpp:775
 msgid "Kick from party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:233 src/gui/popupmenu.cpp:245
+#: src/gui/popupmenu.cpp:495 src/gui/popupmenu.cpp:792
 msgid "Kick from guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:238 src/gui/popupmenu.cpp:250
+#: src/gui/popupmenu.cpp:500 src/gui/popupmenu.cpp:797
 msgid "Change pos in guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:258 src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:806
 msgid "Invite to guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:266
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:268
 msgid "Nuke"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:740
+#: src/gui/popupmenu.cpp:829
 msgid "Show Items"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:741
+#: src/gui/popupmenu.cpp:830 src/gui/popupmenu.cpp:2137
 msgid "Undress"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:272 src/gui/popupmenu.cpp:302
+#: src/gui/popupmenu.cpp:468 src/gui/popupmenu.cpp:742
+#: src/gui/popupmenu.cpp:831
 msgid "Add comment"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
+#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
 msgid "Buy (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:758 src/gui/popupmenu.cpp:837
 msgid "Sell (?)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:313
 msgid "Kick"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:324
 msgid "Remove from attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:329
 msgid "Add to priority attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:331
 msgid "Add to attack list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:333
 msgid "Add to ignore list"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:346 src/gui/popupmenu.cpp:520
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:359 src/gui/setup_players.cpp:47
+msgid "Players"
+msgstr "玩家"
+
+#: src/gui/popupmenu.cpp:547
 msgid "Pick up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:548 src/gui/popupmenu.cpp:1849
+#: src/gui/popupmenu.cpp:1933 src/gui/popupmenu.cpp:1980
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:567
 msgid "Map Item"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:568
 msgid "Rename"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:569 src/gui/popupmenu.cpp:2096
+#: src/gui/popupmenu.cpp:2107 src/gui/popupmenu.cpp:2111
 msgid "Remove"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:510
-msgid "Load old outfits"
+#: src/gui/popupmenu.cpp:574
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:590
+msgid "Clear outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:609 src/gui/windowmenu.cpp:96
 msgid "Spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:610
 msgid "Load old spells"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:611
 msgid "Edit spell"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:637
 msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:639
 msgid "Enable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:641
+msgid "Don't remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:643
 msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:645
 msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:647
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:652 src/gui/socialwindow.cpp:1263
 msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:655
+msgid "Copy to clipboard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:850
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1336
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1338
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1383
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1385
 msgid "Comment:                      "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1787
 msgid "Add to trade"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1791
 msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1792
 msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1793
 msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1803
 msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1804
 msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1805
 msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1825 src/gui/popupmenu.cpp:1921
+#: src/gui/popupmenu.cpp:1968
 msgid "Drop all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1844
 msgid "Retrieve 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1845
 msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1846
 msgid "Retrieve all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1879 src/gui/popupmenu.cpp:1937
 msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1984
 msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:2012 src/gui/popupmenu.cpp:2049
 msgid "Hide"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:2018 src/gui/popupmenu.cpp:2055
 msgid "Show"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:2061
 msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:2063 src/gui/statuswindow.cpp:248
 msgid "Copy to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:2083 src/gui/setup_theme.cpp:62
+#: src/gui/setup_theme.cpp:119 src/gui/socialwindow.cpp:983
+#: src/gui/socialwindow.cpp:1018 src/gui/socialwindow.cpp:1053
 msgid "(default)"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:2093 src/gui/popupmenu.cpp:2104
 msgid "Move up"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:2095 src/gui/popupmenu.cpp:2106
 msgid "Move down"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr ""
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
 msgid "Switch server"
 msgstr "交�伺�器"
 
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:53
 msgid "Switch character"
 msgstr "交�角色"
 
@@ -1615,200 +1734,239 @@ msgstr ""
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:244
-msgid "Port:"
-msgstr "端�(port):"
-
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:243
 msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-msgid "Server type:"
-msgstr ""
-
-#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:263
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:288
-msgid "Custom Server"
-msgstr ""
+#: src/gui/serverdialog.cpp:264 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+msgid "Add"
+msgstr "增加"
 
-#: src/gui/serverdialog.cpp:393
-msgid "Please type both the address and the port of a server."
-msgstr "請輸入伺�氣得IP地�和Port"
+#: src/gui/serverdialog.cpp:265 src/gui/widgets/setupitem.cpp:285
+#: src/gui/widgets/setupitem.cpp:409
+msgid "Edit"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:444
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:449
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:453
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:457
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:548
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Enable Audio"
+#: src/gui/setup_audio.cpp:45
+msgid "(no sound)"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
-msgid "Enable game sfx"
+#: src/gui/setup_audio.cpp:55
+msgid "Audio"
+msgstr "音效"
+
+#: src/gui/setup_audio.cpp:64
+msgid "Basic settings"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:52
-msgid "Enable gui sfx"
+#: src/gui/setup_audio.cpp:66
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:53
+#: src/gui/setup_audio.cpp:68
 msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:54
-msgid "Enable mumble voice chat"
+#: src/gui/setup_audio.cpp:71
+msgid "Enable game sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:56
-msgid "Download music"
+#: src/gui/setup_audio.cpp:74
+msgid "Enable gui sfx"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:61
-msgid "Audio"
-msgstr "音效"
-
-#: src/gui/setup_audio.cpp:64
+#: src/gui/setup_audio.cpp:77
 msgid "Sfx volume"
 msgstr "音效音�"
 
-#: src/gui/setup_audio.cpp:65
+#: src/gui/setup_audio.cpp:80
 msgid "Music volume"
 msgstr "音樂音�"
 
-#: src/gui/setup_audio.cpp:120
-msgid "Notice"
+#: src/gui/setup_audio.cpp:83
+msgid "Sound effects"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:85
+msgid "Information dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:88
+msgid "Request dialog sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:91
+msgid "Whisper message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "Guild / Party message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:97
+msgid "Highlight message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:100
+msgid "Global message sound"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:103
+msgid "Error message sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:120
-msgid "You may have to restart your client if you want to download new music"
+#: src/gui/setup_audio.cpp:106
+msgid "Trade request sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:133
-msgid "Sound Engine"
+#: src/gui/setup_audio.cpp:109 src/gui/setup_chat.cpp:122
+#: src/gui/setup_other.cpp:165
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:111
+msgid "Enable mumble voice chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:55 src/gui/setup_colors.cpp:54
+#: src/gui/setup_audio.cpp:114
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:54 src/gui/setup_colors.cpp:54
 msgid "Colors"
 msgstr "�色"
 
-#: src/gui/setup_chat.cpp:57
+#: src/gui/setup_chat.cpp:56
 msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60
+#: src/gui/setup_chat.cpp:59
 msgid "Show chat colors list"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:64
+#: src/gui/setup_chat.cpp:63
 msgid "Commands"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:66
+#: src/gui/setup_chat.cpp:65
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:70
+#: src/gui/setup_chat.cpp:69
 msgid "Limits"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:72
+#: src/gui/setup_chat.cpp:71
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:74
 msgid "Limit max lines in chat"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:79
+#: src/gui/setup_chat.cpp:78
 msgid "Logs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:81
+#: src/gui/setup_chat.cpp:80
 msgid "Enable chat Log"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:83
 msgid "Show chat history"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:88
+#: src/gui/setup_chat.cpp:87
 msgid "Messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:90
+#: src/gui/setup_chat.cpp:89
 msgid "Hide shop messages"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:94
+#: src/gui/setup_chat.cpp:93
 msgid "Tabs"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:96
+#: src/gui/setup_chat.cpp:95
 msgid "Put all whispers in tabs"
 msgstr "將所有的悄悄話放到分�中"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:98
 msgid "Log magic messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:102
+#: src/gui/setup_chat.cpp:101
 msgid "Show server messages in debug tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:105
+#: src/gui/setup_chat.cpp:104
 msgid "Enable trade tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:108
+#: src/gui/setup_chat.cpp:107
 msgid "Enable battle tab"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:111
+#: src/gui/setup_chat.cpp:110
 msgid "Show battle events"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:114
+#: src/gui/setup_chat.cpp:113
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:118
+#: src/gui/setup_chat.cpp:117
 msgid "Time"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:120
+#: src/gui/setup_chat.cpp:119
 msgid "Use local time"
 msgstr ""
 
+#: src/gui/setup_chat.cpp:124
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:127
+msgid "Show MVP messages"
+msgstr ""
+
 #: src/gui/setup_colors.cpp:49
 msgid "This is what the color looks like"
 msgstr "這是�色看起來的樣�"
@@ -1856,41 +2014,41 @@ msgstr ""
 msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:72
 msgid "Apply"
 msgstr "確定"
 
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:75
 msgid "Reset Windows"
 msgstr "�置視窗"
 
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
-#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
+#: src/gui/setup_joystick.cpp:45 src/gui/setup_joystick.cpp:117
 msgid "Press the button to start calibration"
 msgstr "按下按鈕開始矯正"
 
-#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
+#: src/gui/setup_joystick.cpp:46 src/gui/setup_joystick.cpp:115
 msgid "Calibrate"
 msgstr "矯正"
 
-#: src/gui/setup_joystick.cpp:42
+#: src/gui/setup_joystick.cpp:47
 msgid "Enable joystick"
 msgstr "啟用�桿"
 
-#: src/gui/setup_joystick.cpp:44
+#: src/gui/setup_joystick.cpp:50
+msgid "Use joystick if client window inactive"
+msgstr ""
+
+#: src/gui/setup_joystick.cpp:53
 msgid "Joystick"
 msgstr "�桿"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:122
 msgid "Stop"
 msgstr "�止"
 
-#: src/gui/setup_joystick.cpp:85
-msgid "Rotate the stick"
-msgstr "旋轉手柄"
+#: src/gui/setup_joystick.cpp:124
+msgid "Rotate the stick and don't press buttons"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -1912,360 +2070,460 @@ msgstr "�設"
 msgid "Key Conflict(s) Detected."
 msgstr "檢測到按���。"
 
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:38
 msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:44 src/gui/userpalette.cpp:125
 msgid "Monsters"
 msgstr "怪物"
 
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:46
 msgid "Show damage inflicted to monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:49
 msgid "Auto target only reachable monsters"
 msgstr ""
 
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:52
 msgid "Highlight monster attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:56
 msgid "Show monster hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:59
 msgid "Cycle monster targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:65
 msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:68
 msgid "Highlight map portals"
 msgstr ""
 
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:71
 msgid "Highlight floor items"
 msgstr ""
 
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:74
 msgid "Highlight player attack range"
 msgstr ""
 
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:77
 msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:80
 msgid "Draw path"
 msgstr ""
 
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:83
 msgid "Draw hotkeys on map"
 msgstr ""
 
+#: src/gui/setup_other.cpp:86
+msgid "Enable lazy scrolling"
+msgstr ""
+
 #: src/gui/setup_other.cpp:89
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:92
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:96
 msgid "Moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:98
 msgid "Auto fix position"
 msgstr ""
 
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:101
 msgid "Attack while moving"
 msgstr ""
 
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:104
 msgid "Sync player move"
 msgstr ""
 
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:107
 msgid "Crazy move A program"
 msgstr ""
 
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:111
 msgid "Player"
 msgstr ""
 
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:113
 msgid "Show own hp bar"
 msgstr ""
 
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:116
 msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:119
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:122
 msgid "Show job exp messages"
 msgstr ""
 
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:125
 msgid "Show players popups"
 msgstr ""
 
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:128
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:131
 msgid "Show job"
 msgstr ""
 
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:134
 msgid "Enable attack filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:137
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:143
 msgid "Accept sell/buy requests"
 msgstr ""
 
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:146
 msgid "Enable shop mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:152
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:156
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:158
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
+msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:167
 msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:170
 msgid "Enable bot checker"
 msgstr ""
 
-#: src/gui/setup_other.cpp:157
-msgid "Enable buggy servers protection"
+#: src/gui/setup_other.cpp:173
+msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:177
 msgid "Enable debug log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:180
 msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:183
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:186
 msgid "Show background"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:48
-msgid "Perfomance"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:55
+#: src/gui/setup_perfomance.cpp:54
 msgid "Better perfomance (enable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:58
+#: src/gui/setup_perfomance.cpp:57
 msgid "Auto adjust perfomance"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
+#: src/gui/setup_perfomance.cpp:60
 msgid "Hw acceleration"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:63
 msgid "Enable opacity cache (Software, can use many memory)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:66
 msgid "Enable map reduce (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:69
 msgid "Better quality (disable for better perfomance)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:72
 msgid "Enable alpha channel fix (Software, can be very slow)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:80
+#: src/gui/setup_perfomance.cpp:76
+msgid "Show beings transparency"
+msgstr ""
+
+#: src/gui/setup_perfomance.cpp:79
 msgid "Enable reorder sprites."
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:83
+#: src/gui/setup_perfomance.cpp:82
 msgid "Small memory (enable for lower memory usage)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:86
+#: src/gui/setup_perfomance.cpp:85
 msgid "Disable advanced beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_perfomance.cpp:89
+#: src/gui/setup_perfomance.cpp:88
 msgid "Disable beings caching (Software)"
 msgstr ""
 
-#: src/gui/setup_players.cpp:48
-msgid "Players"
-msgstr "玩家"
-
-#: src/gui/setup_players.cpp:54
+#: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:56
 msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_players.cpp:60
+#: src/gui/setup_players.cpp:59
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:62
+msgid "Enable extended mouse targeting"
+msgstr ""
+
+#: src/gui/setup_players.cpp:65
 msgid "Target dead players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:68
 msgid "Visible names"
 msgstr "�見的�稱"
 
-#: src/gui/setup_players.cpp:69
+#: src/gui/setup_players.cpp:71
 msgid "Secure trades"
 msgstr ""
 
-#: src/gui/setup_players.cpp:72
+#: src/gui/setup_players.cpp:74
 msgid "Unsecure chars in names"
 msgstr ""
 
-#: src/gui/setup_players.cpp:75
+#: src/gui/setup_players.cpp:77
 msgid "Show statuses"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:65
+#: src/gui/setup_players.cpp:80
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:83
+msgid "Allow self heal with mouse click"
+msgstr ""
+
+#: src/gui/setup_players.cpp:86
+msgid "Group friends in who is online window"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:66
 msgid "Relation"
 msgstr "關係"
 
-#: src/gui/setup_relations.cpp:70
+#: src/gui/setup_relations.cpp:71
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:72
 msgid "Friend"
 msgstr "好�"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:73
 msgid "Disregarded"
 msgstr "��"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:74
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:75
 msgid "Erased"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:239
+#: src/gui/setup_relations.cpp:76
+msgid "Blacklisted"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:77
+msgid "Enemy"
+msgstr ""
+
+#: src/gui/setup_relations.cpp:243
 msgid "Allow trading"
 msgstr "�許交易"
 
-#: src/gui/setup_relations.cpp:241
+#: src/gui/setup_relations.cpp:245
 msgid "Allow whispers"
 msgstr "�許密語"
 
-#: src/gui/setup_relations.cpp:244
+#: src/gui/setup_relations.cpp:248
 msgid "Old"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:246
+#: src/gui/setup_relations.cpp:250
 msgid "Relations"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:271
+#: src/gui/setup_relations.cpp:272
 msgid "When ignoring:"
 msgstr "當忽略時："
 
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:82
 msgid "Tiny (10)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:83
 msgid "Small (11)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:84
 msgid "Medium (12)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:85
 msgid "Large (13)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:86
 msgid "Big (14)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:87
 msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:120
+msgid "Chinese (China)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:121
+msgid "Czech"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:122
+msgid "English"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:123
+msgid "Finnish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:124
+msgid "French"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:125
+msgid "German"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:126
+msgid "Indonesian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:127
+msgid "Polish"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:128
+msgid "Japanese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:129
+msgid "Dutch (Belgium/Flemish)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:130
+msgid "Portuguese"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:131
+msgid "Portuguese (Brazilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:132
+msgid "Russian"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:133
+msgid "Spanish (Castilian)"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:165
 msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:167
 msgid "Gui theme"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:168
+msgid "Language"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:169
 msgid "Main Font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:170
 msgid "Bold font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:171
 msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:172
 msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:173
 msgid "Secure font"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:174
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:211
 msgid "Font size"
 msgstr "字型大�"
 
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:352
 msgid "Theme Changed"
 msgstr ""
 
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
-#: src/gui/setup_video.cpp:624
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
+#: src/gui/setup_video.cpp:510
 msgid "Restart your client for the change to take effect."
 msgstr "請�新啟動您的客戶端讓變更生效。"
 
@@ -2281,408 +2539,441 @@ msgstr ""
 msgid "Safe OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
-msgid "No text"
-msgstr "沒有文字"
-
-#: src/gui/setup_video.cpp:225
-msgid "Text"
-msgstr "文字"
-
 #: src/gui/setup_video.cpp:227
-msgid "Bubbles, no names"
-msgstr "有�天泡泡,沒�字"
-
-#: src/gui/setup_video.cpp:229
-msgid "Bubbles with names"
-msgstr "�天泡泡加�字"
-
-#: src/gui/setup_video.cpp:242
-msgid "off"
-msgstr "關閉"
-
-#: src/gui/setup_video.cpp:244 src/gui/setup_video.cpp:261
-msgid "low"
-msgstr "低"
-
-#: src/gui/setup_video.cpp:246 src/gui/setup_video.cpp:265
-msgid "high"
-msgstr "高"
-
-#: src/gui/setup_video.cpp:263
-msgid "medium"
-msgstr "中"
-
-#: src/gui/setup_video.cpp:267
-msgid "max"
-msgstr "最大"
-
-#: src/gui/setup_video.cpp:288
 msgid "Full screen"
 msgstr "全螢幕"
 
-#: src/gui/setup_video.cpp:289
+#: src/gui/setup_video.cpp:228
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
-#: src/gui/setup_video.cpp:291
-msgid "Particle effects"
-msgstr "粒�效果"
-
-#: src/gui/setup_video.cpp:293
-msgid "Show pickup notification"
-msgstr "顯示撿拾通知"
-
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:295
-msgid "in chat"
-msgstr "�天中"
+#: src/gui/setup_video.cpp:230
+msgid "Enable resize"
+msgstr ""
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:297
-msgid "as particle"
-msgstr "�粒�設定"
+#: src/gui/setup_video.cpp:231
+msgid "No frame"
+msgstr ""
 
-#: src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:232
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
+#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:315
-msgid "Video"
-msgstr "顯示"
-
-#: src/gui/setup_video.cpp:321
-msgid "Overhead text"
-msgstr "置頂文字"
-
-#: src/gui/setup_video.cpp:322
-msgid "Gui opacity"
-msgstr "Gui �明度"
-
-#: src/gui/setup_video.cpp:323
-msgid "Ambient FX"
-msgstr "環境效果"
-
-#: src/gui/setup_video.cpp:324
-msgid "Particle detail"
-msgstr ""
-
-#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
-#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
+#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
+#: src/gui/setup_video.cpp:551
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:378
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:490
+#: src/gui/setup_video.cpp:384
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:395
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:396
 msgid "Restart needed for changes to take effect."
 msgstr "請�新啟動"
 
-#: src/gui/setup_video.cpp:514
+#: src/gui/setup_video.cpp:408
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:515
+#: src/gui/setup_video.cpp:409
 msgid "Applying change to OpenGL requires restart."
 msgstr "確�切�OpenGL需��新開始"
 
-#: src/gui/setup_video.cpp:602
+#: src/gui/setup_video.cpp:484
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:603
+#: src/gui/setup_video.cpp:485
 msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
+#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:621
+#: src/gui/setup_video.cpp:504
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:654
-msgid "Particle Effect Settings Changed."
+#: src/gui/setup_visual.cpp:36
+msgid "Visual"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:44
+msgid "Show pickup notifications in chat"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:47
+msgid "Show pickup notifications as particle effects"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:50
+msgid "Grab mouse and keyboard input"
 msgstr ""
 
-#: src/gui/setup_video.cpp:655
-msgid "Changes will take effect on map change."
-msgstr "變更會在地圖改變後生效。"
+#: src/gui/setup_visual.cpp:53
+msgid "Gui opacity"
+msgstr "Gui �明度"
+
+#: src/gui/setup_visual.cpp:57
+msgid "No text"
+msgstr "沒有文字"
+
+#: src/gui/setup_visual.cpp:58
+msgid "Text"
+msgstr "文字"
+
+#: src/gui/setup_visual.cpp:59
+msgid "Bubbles, no names"
+msgstr "有�天泡泡,沒�字"
+
+#: src/gui/setup_visual.cpp:60
+msgid "Bubbles with names"
+msgstr "�天泡泡加�字"
+
+#: src/gui/setup_visual.cpp:61
+msgid "Overhead text"
+msgstr "置頂文字"
 
-#: src/gui/shopwindow.cpp:74
+#: src/gui/setup_visual.cpp:65 src/gui/setup_visual.cpp:88
+msgid "off"
+msgstr "關閉"
+
+#: src/gui/setup_visual.cpp:66 src/gui/setup_visual.cpp:75
+msgid "low"
+msgstr "低"
+
+#: src/gui/setup_visual.cpp:67 src/gui/setup_visual.cpp:77
+msgid "high"
+msgstr "高"
+
+#: src/gui/setup_visual.cpp:68
+msgid "Ambient FX"
+msgstr "環境效果"
+
+#: src/gui/setup_visual.cpp:71
+msgid "Particle effects"
+msgstr "粒�效果"
+
+#: src/gui/setup_visual.cpp:76
+msgid "medium"
+msgstr "中"
+
+#: src/gui/setup_visual.cpp:78
+msgid "max"
+msgstr "最大"
+
+#: src/gui/setup_visual.cpp:79
+msgid "Particle detail"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:83
+msgid "Gamma"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:89
+msgid "on"
+msgstr ""
+
+#: src/gui/setup_visual.cpp:90
+msgid "Vsync"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:76
 msgid "Personal Shop"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:119
 msgid "Buy items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:120
 msgid "Sell items"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
-msgid "Add"
-msgstr "增加"
-
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
 msgid "Announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:128
 msgid "Show links in announce"
 msgstr ""
 
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:761 src/net/ea/tradehandler.cpp:104
 #: src/net/manaserv/tradehandler.cpp:127
 msgid "Request for Trade"
 msgstr "�求交易"
 
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:762
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "技能"
 
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
 msgid "Up"
 msgstr "�級"
 
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:385
+msgid "basic"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:386
+msgid "Skill: basic, Id: 1"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:420
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:432
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:438
+#, c-format
+msgid "Skill: %s, Id: %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:546
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:145 src/gui/socialwindow.cpp:243
+#: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "公會"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:174
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:215
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:216
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:225
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:226
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:346 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "隊�"
 
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:374
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:388
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:415
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:416
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:425
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:426
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:650
 msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:928
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:969
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:1001
 msgid "Attack mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1036
 msgid "Ignore mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1196
 msgid "Create Guild"
 msgstr "建立公會"
 
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1197 src/gui/socialwindow.cpp:1632
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1239 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1262
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1176
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1278
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1282
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1415
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1425
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1442
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1455
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1502
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1525
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1539
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1540
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1554
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1560
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1566
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1581
 msgid "Received party request, but one already exists."
 msgstr "收到派�邀請,但而有�一個存在."
 
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1592
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1596
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1604
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s 邀請你�加他們的派�."
 
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1609
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s 邀請你�加 %s 派�."
 
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1618
 msgid "Accept Party Invite"
 msgstr "接�派�邀請"
 
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1633
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1638
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1639
 msgid "Choose your party's name."
 msgstr ""
 
@@ -2690,502 +2981,139 @@ msgstr ""
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuspopup.cpp:197
-msgid "(D) default moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:202
-msgid "(I) invert moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:207
-msgid "(c) moves with some crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:212
-msgid "(C) moves with crazy moves"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:217
-msgid "(d) double normal + crazy"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:222
-msgid "(?) move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:240
-msgid "(a) custom crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:244
-msgid "(?) crazy move"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:254
-msgid "(0) default moves to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:259
-msgid "(1) moves to target in distance 1"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:264
-msgid "(2) moves to target in distance 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:269
-msgid "(3) moves to target in distance 3"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:274
-msgid "(5) moves to target in distance 5"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:279
-msgid "(7) moves to target in distance 7"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:284
-msgid "(A) moves to target in attack range"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:289
-msgid "(?) move to target"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:297
-msgid "(D) default follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:301
-msgid "(R) relative follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:305
-msgid "(M) mirror follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:309
-msgid "(P) pet follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:313
-msgid "(?) unknown follow"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
-msgid "(D) default attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:327
-msgid "(s) switch attack without shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:332
-msgid "(S) switch attack with shield"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
-msgid "(?) attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:349
-msgid "(G) go and attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:353
-msgid "(A) go, attack, pickup"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:357
-msgid "(d) without auto attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:375
-msgid "(S) small pick up 1x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:379
-msgid "(D) default pick up 2x1 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:383
-msgid "(F) forward pick up 2x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:387
-msgid "(3) pick up 3x3 cells"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:391
-msgid "(g) go and pick up in distance 4"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:395
-msgid "(G) go and pick up in distance 8"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:399
-msgid "(A) go and pick up in max distance"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:403
-msgid "(?) pick up"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:412
-msgid "(N) normal map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:416
-msgid "(D) debug map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:420
-msgid "(u) ultra map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:424
-msgid "(U) ultra map view 2"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:428
-msgid "(e) empty map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:432
-msgid "(b) black & white map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:436
-msgid "(?) map view"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:444
-msgid "(f) use #flar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:449
-msgid "(c) use #chiza for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:454
-msgid "(I) use #ingrav for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:459
-msgid "(F) use #frillyar for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:464
-msgid "(U) use #upmarmu for magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:468
-msgid "(?) magic attack"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:477
-msgid "(D) default imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:481
-msgid "(O) outfits imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:485
-msgid "(?) imitation"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:494
-msgid "(O) on keyboard"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:497
-msgid "(A) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
-msgid "(?) away"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:508
-msgid "(G) game camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:512
-msgid "(F) free camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:516
-msgid "(D) design camera mode"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:527
-msgid "Game modifiers are disabled"
-msgstr ""
-
-#: src/gui/statuspopup.cpp:532
-msgid "Game modifiers are enabled"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:150 src/gui/statuswindow.cpp:280
+#: src/gui/statuswindow.cpp:343
 #, c-format
 msgid "Level: %d"
 msgstr "等級：%d"
 
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:151 src/gui/statuswindow.cpp:266
+#: src/gui/statuswindow.cpp:310
 #, c-format
 msgid "Money: %s"
 msgstr "金錢: %s"
 
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:157
 msgid "HP:"
 msgstr "體力 :"
 
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:164
 msgid "Exp:"
 msgstr "經驗值:"
 
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:178
 msgid "MP:"
 msgstr "魔力:"
 
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:210 src/gui/statuswindow.cpp:393
 #, c-format
 msgid "Job: %d"
 msgstr "�業：%d"
 
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:211
 msgid "Job:"
 msgstr "�業:"
 
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:269 src/gui/statuswindow.cpp:317
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:275
 #, c-format
 msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:331
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
-msgid "(D)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
-msgid "(I)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
-msgid "(c)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:642
-msgid "(C)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
-msgid "(d)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
-msgid "(?)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:659
-msgid "(a)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:670
-msgid "(0)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:673
-msgid "(1)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:676
-msgid "(2)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
-msgid "(3)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:682
-msgid "(5)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:685
-msgid "(7)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
-msgid "(A)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:701
-msgid "(R)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:704
-msgid "(M)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:707
-msgid "(P)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:721
-msgid "(s)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
-msgid "(S)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
-msgid "(G)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:753
-msgid "(f)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
-msgid "(F)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
-msgid "(U)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:789
-msgid "(g)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:806
-msgid "(N)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:812
-msgid "(u)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:818
-msgid "(e)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:821
-msgid "(b)"
-msgstr ""
-
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
-msgid "(O)"
-msgstr ""
-
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "No Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:115
+#: src/gui/textcommandeditor.cpp:114
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "Life Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "War Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Transmute Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Nature Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:125
+#: src/gui/textcommandeditor.cpp:124
 msgid "Astral Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:168
+#: src/gui/textcommandeditor.cpp:167
 msgid "Command Editor"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:185
+#: src/gui/textcommandeditor.cpp:184
 msgid "magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:189
+#: src/gui/textcommandeditor.cpp:188
 msgid "other"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:194
+#: src/gui/textcommandeditor.cpp:193
 msgid "Symbol:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:197
+#: src/gui/textcommandeditor.cpp:196
 msgid "Command:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:200
+#: src/gui/textcommandeditor.cpp:199
+msgid "Comment:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:202
 msgid "Mana:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:206
+#: src/gui/textcommandeditor.cpp:208
 msgid "Target Type:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:212
+#: src/gui/textcommandeditor.cpp:214
 msgid "Icon:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:218
+#: src/gui/textcommandeditor.cpp:220
 msgid "Magic level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:224
+#: src/gui/textcommandeditor.cpp:226
 msgid "Magic School:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:230
+#: src/gui/textcommandeditor.cpp:232
 msgid "School level:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:235
+#: src/gui/textcommandeditor.cpp:237
 msgid "Save"
 msgstr ""
 
@@ -3209,60 +3137,60 @@ msgstr "已��。請�候..."
 msgid "Trade: You"
 msgstr "交易：您"
 
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
 msgid "You give:"
 msgstr "你付出:"
 
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
 msgid "Change"
 msgstr "更改"
 
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
+msgstr "你沒有足夠的金錢."
+
+#: src/gui/tradewindow.cpp:454
 msgid ""
 "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物�失敗。你�能覆蓋視窗中的該類物�能。"
 
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "你沒有足夠的金錢."
-
 #: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "�字：%s"
 
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:140
 msgid "Updating..."
 msgstr "更新中..."
 
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:167
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:170
 msgid "Play"
 msgstr "開始"
 
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:571
 msgid "##1  The update process is incomplete."
 msgstr "##1  更新的程��完整。"
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:573
 msgid "##1  It is strongly recommended that"
 msgstr "##1  強烈建議"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:575
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:751
 msgid "Completed"
 msgstr "已完�"
 
@@ -3414,23 +3342,23 @@ msgstr ""
 msgid "Road Point"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:79 src/gui/whoisonline.cpp:617
 msgid "Who Is Online - Updating"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:103
 msgid "Update"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:197
 msgid "Who Is Online - "
 msgstr ""
 
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:631
 msgid "Who Is Online - error"
 msgstr ""
 
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:670
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -3495,7 +3423,8 @@ msgid "This command makes <nick> a channel operator."
 msgstr "這個指令會讓 <nick> �為頻��作者。"
 
 #: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:62 src/net/ea/gui/guildtab.cpp:70
+#: src/net/ea/gui/partytab.cpp:86
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "如果<暱稱>之間有空格，用雙引號(\")括起來。"
 
@@ -3533,6 +3462,41 @@ msgstr "%s 主�公告："
 msgid "%s whispers: %s"
 msgstr ""
 
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+#: src/net/ea/gui/partytab.cpp:84
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+#: src/net/ea/gui/partytab.cpp:91
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:68 src/net/ea/gui/guildtab.cpp:76
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+#: src/net/ea/gui/partytab.cpp:70
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:113 src/net/ea/gui/guildtab.cpp:139
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
 #: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
@@ -3662,556 +3626,872 @@ msgstr ""
 msgid "Choose World"
 msgstr ""
 
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
 msgid "Storage"
 msgstr ""
 
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
 msgid "Cart"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:45
+msgid "Basic Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:46
 msgid "Move Up"
 msgstr "上移"
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:47
 msgid "Move Down"
 msgstr "下移"
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:48
 msgid "Move Left"
 msgstr "左移"
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:49
 msgid "Move Right"
 msgstr "�移"
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:52
 msgid "Target & Attack"
 msgstr "尋找目標攻擊"
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:54
 msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:56
 msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:58
 msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:60
 msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:62
 msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:61
-msgid "Smilie"
-msgstr "��姆�掉妳了~~"
-
-#: src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:65
 msgid "Stop Attack"
 msgstr "�止攻擊"
 
-#: src/keyboardconfig.cpp:64
+#: src/keyboardconfig.cpp:67
+msgid "Untarget"
+msgstr ""
+
+#: src/keyboardconfig.cpp:68
 msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:66
+#: src/keyboardconfig.cpp:70
 msgid "Target NPC"
 msgstr "以 NPC 為目標"
 
-#: src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:71
 msgid "Target Player"
 msgstr "以玩家為目標"
 
-#: src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:73
 msgid "Pickup"
 msgstr "撿拾"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:74
 msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:76
 msgid "Hide Windows"
 msgstr "隱�視窗"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:78
 msgid "Sit"
 msgstr "�下"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:79
 msgid "Screenshot"
 msgstr "螢幕快照"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:80
 msgid "Enable/Disable Trading"
 msgstr "啟用/�用交易"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:82
 msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:84
+msgid "Select OK"
+msgstr "�擇確定"
+
+#: src/keyboardconfig.cpp:87
+msgid "Shortcuts Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:88
 msgid "Item Shortcuts Key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
 #: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
 #: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
 #: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
-#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
-#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
-#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
-#: src/keyboardconfig.cpp:360
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:112
+#: src/keyboardconfig.cpp:114 src/keyboardconfig.cpp:116
+#: src/keyboardconfig.cpp:118 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:123 src/keyboardconfig.cpp:125
+#: src/keyboardconfig.cpp:127 src/keyboardconfig.cpp:129
+#: src/keyboardconfig.cpp:381
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "物��徑� %d"
 
-#: src/keyboardconfig.cpp:122
+#: src/keyboardconfig.cpp:130
+msgid "Windows Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:131
 msgid "Help Window"
 msgstr "說明視窗"
 
-#: src/keyboardconfig.cpp:124
+#: src/keyboardconfig.cpp:133
 msgid "Status Window"
 msgstr "狀態視窗"
 
-#: src/keyboardconfig.cpp:126
+#: src/keyboardconfig.cpp:135
 msgid "Inventory Window"
 msgstr "物�欄視窗"
 
-#: src/keyboardconfig.cpp:128
+#: src/keyboardconfig.cpp:137
 msgid "Equipment Window"
 msgstr "物�視窗"
 
-#: src/keyboardconfig.cpp:130
+#: src/keyboardconfig.cpp:139
 msgid "Skill Window"
 msgstr "技能視窗"
 
-#: src/keyboardconfig.cpp:132
+#: src/keyboardconfig.cpp:141
 msgid "Minimap Window"
 msgstr "迷你地圖視窗"
 
-#: src/keyboardconfig.cpp:134
+#: src/keyboardconfig.cpp:143
 msgid "Chat Window"
 msgstr "�天視窗"
 
-#: src/keyboardconfig.cpp:136
+#: src/keyboardconfig.cpp:145
 msgid "Item Shortcut Window"
 msgstr "物��徑�視窗"
 
-#: src/keyboardconfig.cpp:138
+#: src/keyboardconfig.cpp:147
 msgid "Setup Window"
 msgstr "設定視窗"
 
-#: src/keyboardconfig.cpp:140
+#: src/keyboardconfig.cpp:149
 msgid "Debug Window"
 msgstr "程�除錯視窗"
 
-#: src/keyboardconfig.cpp:142
+#: src/keyboardconfig.cpp:151
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:144
+#: src/keyboardconfig.cpp:153
 msgid "Emote Shortcut Window"
 msgstr "表情�徑�視窗"
 
-#: src/keyboardconfig.cpp:146
+#: src/keyboardconfig.cpp:155
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:148
+#: src/keyboardconfig.cpp:157
 msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:150
+#: src/keyboardconfig.cpp:159
 msgid "Quick drop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:152
+#: src/keyboardconfig.cpp:161
 msgid "Kill Stats Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:154
+#: src/keyboardconfig.cpp:163
 msgid "Commands Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:156
+#: src/keyboardconfig.cpp:165
 msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:159
+#: src/keyboardconfig.cpp:168
 msgid "Who Is Online Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:170
 msgid "Did you know Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:164
+#: src/keyboardconfig.cpp:173
 msgid "Previous Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:166
+#: src/keyboardconfig.cpp:175
 msgid "Next Social Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
-#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
-#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
-#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
-#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
-#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
-#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
-#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
-#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
-#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
-#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
-#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
-#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
-#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
-#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
-#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
-#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
-#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
-#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
-#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
-#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
-#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
-#: src/keyboardconfig.cpp:355
+#: src/keyboardconfig.cpp:177
+msgid "Emotes Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:178
+msgid "Smilie"
+msgstr "��姆�掉妳了~~"
+
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:183 src/keyboardconfig.cpp:185
+#: src/keyboardconfig.cpp:187 src/keyboardconfig.cpp:189
+#: src/keyboardconfig.cpp:191 src/keyboardconfig.cpp:193
+#: src/keyboardconfig.cpp:195 src/keyboardconfig.cpp:197
+#: src/keyboardconfig.cpp:199 src/keyboardconfig.cpp:201
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:210
+#: src/keyboardconfig.cpp:212 src/keyboardconfig.cpp:214
+#: src/keyboardconfig.cpp:216 src/keyboardconfig.cpp:218
+#: src/keyboardconfig.cpp:220 src/keyboardconfig.cpp:222
+#: src/keyboardconfig.cpp:224 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:231
+#: src/keyboardconfig.cpp:234 src/keyboardconfig.cpp:237
+#: src/keyboardconfig.cpp:239 src/keyboardconfig.cpp:241
+#: src/keyboardconfig.cpp:243 src/keyboardconfig.cpp:245
+#: src/keyboardconfig.cpp:247 src/keyboardconfig.cpp:249
+#: src/keyboardconfig.cpp:251 src/keyboardconfig.cpp:253
+#: src/keyboardconfig.cpp:255 src/keyboardconfig.cpp:258
+#: src/keyboardconfig.cpp:260 src/keyboardconfig.cpp:262
+#: src/keyboardconfig.cpp:264 src/keyboardconfig.cpp:266
+#: src/keyboardconfig.cpp:268 src/keyboardconfig.cpp:270
+#: src/keyboardconfig.cpp:272 src/keyboardconfig.cpp:274
+#: src/keyboardconfig.cpp:276 src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:376
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "表情�徑� %d"
 
-#: src/keyboardconfig.cpp:261
+#: src/keyboardconfig.cpp:280
+msgid "Outfits Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:281
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:263
+#: src/keyboardconfig.cpp:283
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:265
+#: src/keyboardconfig.cpp:285
 msgid "Copy equipped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:267
+#: src/keyboardconfig.cpp:287
+msgid "Chat Keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
 msgid "Toggle Chat"
 msgstr "切��天"
 
-#: src/keyboardconfig.cpp:269
+#: src/keyboardconfig.cpp:290
 msgid "Scroll Chat Up"
 msgstr "將�天�上�動"
 
-#: src/keyboardconfig.cpp:271
+#: src/keyboardconfig.cpp:292
 msgid "Scroll Chat Down"
 msgstr "將�天�下�動"
 
-#: src/keyboardconfig.cpp:273
+#: src/keyboardconfig.cpp:294
 msgid "Previous Chat Tab"
 msgstr "�一個�天分�"
 
-#: src/keyboardconfig.cpp:275
+#: src/keyboardconfig.cpp:296
 msgid "Next Chat Tab"
 msgstr "下一個�天分�"
 
-#: src/keyboardconfig.cpp:278
+#: src/keyboardconfig.cpp:299
 msgid "Close current Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:280
+#: src/keyboardconfig.cpp:301
 msgid "Previous chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:282
+#: src/keyboardconfig.cpp:303
 msgid "Next chat line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:284
+#: src/keyboardconfig.cpp:305
 msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:286
+#: src/keyboardconfig.cpp:307
 msgid "Deactivate Chat Input"
 msgstr ""
 
-#: src/keyboardconfig.cpp:288
-msgid "Select OK"
-msgstr "�擇確定"
+#: src/keyboardconfig.cpp:309
+msgid "Other Keys"
+msgstr ""
 
-#: src/keyboardconfig.cpp:291
+#: src/keyboardconfig.cpp:310
 msgid "Ignore input 1"
 msgstr "忽略輸入 1"
 
-#: src/keyboardconfig.cpp:293
+#: src/keyboardconfig.cpp:312
 msgid "Ignore input 2"
 msgstr "忽略輸入 2"
 
-#: src/keyboardconfig.cpp:295
+#: src/keyboardconfig.cpp:314
 msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:296
+#: src/keyboardconfig.cpp:315
 msgid "Direct Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:298
+#: src/keyboardconfig.cpp:317
 msgid "Direct Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:299
+#: src/keyboardconfig.cpp:318
 msgid "Direct Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:301
+#: src/keyboardconfig.cpp:320
 msgid "Crazy moves"
 msgstr ""
 
-#: src/keyboardconfig.cpp:303
+#: src/keyboardconfig.cpp:322
 msgid "Change Crazy Move mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:305
+#: src/keyboardconfig.cpp:324
 msgid "Quick Drop N Items from 0 slot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:307
+#: src/keyboardconfig.cpp:326
 msgid "Quick Drop N Items"
 msgstr ""
 
-#: src/keyboardconfig.cpp:309
+#: src/keyboardconfig.cpp:328
 msgid "Switch Quick Drop Counter"
 msgstr ""
 
-#: src/keyboardconfig.cpp:311
+#: src/keyboardconfig.cpp:330
 msgid "Quick heal target or self"
 msgstr ""
 
-#: src/keyboardconfig.cpp:313
+#: src/keyboardconfig.cpp:332
 msgid "Use #itenplz spell"
 msgstr ""
 
-#: src/keyboardconfig.cpp:315
+#: src/keyboardconfig.cpp:334
 msgid "Use magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:317
+#: src/keyboardconfig.cpp:336
 msgid "Switch magic attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:319
+#: src/keyboardconfig.cpp:339
+msgid "Switch pvp attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:340
 msgid "Change move type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:321
+#: src/keyboardconfig.cpp:342
 msgid "Change Attack Weapon Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:323
+#: src/keyboardconfig.cpp:344
 msgid "Change Attack Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:325
+#: src/keyboardconfig.cpp:346
 msgid "Change Follow mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:327
+#: src/keyboardconfig.cpp:348
 msgid "Change Imitation mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:330
+#: src/keyboardconfig.cpp:351
 msgid "Disable / Enable Game modifier keys"
 msgstr ""
 
-#: src/keyboardconfig.cpp:331
+#: src/keyboardconfig.cpp:352
 msgid "On / Off audio"
 msgstr ""
 
-#: src/keyboardconfig.cpp:333
+#: src/keyboardconfig.cpp:354
 msgid "Enable / Disable away mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:335
+#: src/keyboardconfig.cpp:356
 msgid "Emulate right click from keyboard"
 msgstr ""
 
-#: src/keyboardconfig.cpp:337
+#: src/keyboardconfig.cpp:358
 msgid "Toggle camera mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:339
+#: src/keyboardconfig.cpp:360
 msgid "Modifier key"
 msgstr ""
 
-#: src/keyboardconfig.cpp:411
+#: src/keyboardconfig.cpp:439
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:371
-msgid "You were killed by "
+#: src/localplayer.cpp:381
+#, c-format
+msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1436
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1439
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1442
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1445
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1448
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1451
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1454
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1478
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:1680 src/localplayer.cpp:1714 src/localplayer.cpp:1715
+msgid "xp"
+msgstr ""
+
+#: src/localplayer.cpp:1720 src/localplayer.cpp:1727 src/localplayer.cpp:1734
+msgid "job"
+msgstr ""
+
+#: src/localplayer.cpp:1907
+msgid "(D) default moves"
+msgstr ""
+
+#: src/localplayer.cpp:1908
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/localplayer.cpp:1909
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1910
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/localplayer.cpp:1911
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/localplayer.cpp:1912
+msgid "(?) unknown move"
+msgstr ""
+
+#: src/localplayer.cpp:1934
+#, c-format
+msgid "(%d) crazy move number %d"
+msgstr ""
+
+#: src/localplayer.cpp:1939
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1943
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/localplayer.cpp:1957
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/localplayer.cpp:1958
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/localplayer.cpp:1959
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/localplayer.cpp:1960
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/localplayer.cpp:1961
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/localplayer.cpp:1962
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/localplayer.cpp:1963
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1964
+msgid "(a) archer attack range"
+msgstr ""
+
+#: src/localplayer.cpp:1965
+msgid "(?) move to target"
+msgstr ""
+
+#: src/localplayer.cpp:1984
+msgid "(D) default follow"
+msgstr ""
+
+#: src/localplayer.cpp:1985
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/localplayer.cpp:1986
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/localplayer.cpp:1987
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/localplayer.cpp:1988
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/localplayer.cpp:2007 src/localplayer.cpp:2011 src/localplayer.cpp:2034
+msgid "(?) attack"
+msgstr ""
+
+#: src/localplayer.cpp:2008 src/localplayer.cpp:2030
+msgid "(D) default attack"
+msgstr ""
+
+#: src/localplayer.cpp:2009
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/localplayer.cpp:2010
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/localplayer.cpp:2031
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/localplayer.cpp:2032
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/localplayer.cpp:2033
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/localplayer.cpp:2085
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2086
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2087
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2088
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/localplayer.cpp:2089
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/localplayer.cpp:2090
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/localplayer.cpp:2091
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/localplayer.cpp:2092
+msgid "(?) pick up"
+msgstr ""
+
+#: src/localplayer.cpp:2105
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/localplayer.cpp:2106
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/localplayer.cpp:2107
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/localplayer.cpp:2108
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/localplayer.cpp:2109
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/localplayer.cpp:2110
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/localplayer.cpp:2129
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2130
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2131
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2132
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2133
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2134
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/localplayer.cpp:2153
+msgid "(a) attack all players"
+msgstr ""
+
+#: src/localplayer.cpp:2154
+msgid "(f) attack all except friends"
+msgstr ""
+
+#: src/localplayer.cpp:2155
+msgid "(b) attack bad relations"
+msgstr ""
+
+#: src/localplayer.cpp:2156
+msgid "(d) don't attack players"
+msgstr ""
+
+#: src/localplayer.cpp:2157
+msgid "(?) pvp attack"
+msgstr ""
+
+#: src/localplayer.cpp:2176
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2177
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2178
+msgid "(?) imitation"
+msgstr ""
+
+#: src/localplayer.cpp:2206
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:2226
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/localplayer.cpp:2227
+msgid "(A) away"
+msgstr ""
+
+#: src/localplayer.cpp:2228 src/localplayer.cpp:2243
+msgid "(?) away"
+msgstr ""
+
+#: src/localplayer.cpp:2241
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2242
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/localplayer.cpp:2267
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/localplayer.cpp:2268
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/localplayer.cpp:2269
+msgid "Game modifiers are unknown"
+msgstr ""
+
+#: src/localplayer.cpp:3783
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3785 src/localplayer.cpp:3800
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3792
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3794 src/localplayer.cpp:3802
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:4150
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
-msgid "manaplus [options] [mana-file]"
+#: src/main.cpp:55
+msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "[mana-file] : The mana file is an XML file (.mana)"
+#: src/main.cpp:56
+msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "              used to set custom parameters"
+#: src/main.cpp:58
+msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:50
-msgid "              to the manaplus client."
+#: src/main.cpp:59
+msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:61
 msgid "Options:"
 msgstr "�項:"
 
-#: src/main.cpp:53
+#: src/main.cpp:62
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:63
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:64
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:65
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:66
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:67
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:68
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:69
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:70
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:71
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:72
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:73
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:66
+#: src/main.cpp:75
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:76
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:69
+#: src/main.cpp:78
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:80
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:81
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:82
+msgid "  -T --tests          : Start testing drivers and auto configuring"
+msgstr ""
+
+#: src/main.cpp:85
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -4227,142 +4507,130 @@ msgstr "��光臨."
 msgid "Unable to buy."
 msgstr "�能購買."
 
-#: src/net/ea/charserverhandler.cpp:63
+#: src/net/ea/charserverhandler.cpp:66
 msgid "Strength:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:64
+#: src/net/ea/charserverhandler.cpp:67
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:65
+#: src/net/ea/charserverhandler.cpp:68
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:66
+#: src/net/ea/charserverhandler.cpp:69
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:67
+#: src/net/ea/charserverhandler.cpp:70
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:68
+#: src/net/ea/charserverhandler.cpp:71
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:102
+#: src/net/ea/charserverhandler.cpp:115
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/ea/charserverhandler.cpp:119
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
+#: src/net/ea/charserverhandler.cpp:122
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:138
+#: src/net/ea/charserverhandler.cpp:151
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
+#: src/net/ea/charserverhandler.cpp:155 src/net/ea/loginhandler.cpp:246
 msgid "Wrong name."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:145
+#: src/net/ea/charserverhandler.cpp:158
 msgid "Incorrect stats."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:148
+#: src/net/ea/charserverhandler.cpp:161
 msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:151
+#: src/net/ea/charserverhandler.cpp:164
 msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:166 src/net/manaserv/charhandler.cpp:210
+#: src/net/ea/charserverhandler.cpp:167
+msgid "Incorrect race."
+msgstr ""
+
+#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
 msgid "Info"
 msgstr "資訊"
 
-#: src/net/ea/charserverhandler.cpp:166
+#: src/net/ea/charserverhandler.cpp:182
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:172
+#: src/net/ea/charserverhandler.cpp:188
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:346
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:350
 msgid "MVP player: "
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr ""
-
-#: src/net/ea/gamehandler.cpp:98
-msgid "Game"
+#: src/net/ea/chathandler.cpp:370
+msgid "All whispers ignored."
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:98
-msgid "Request to quit denied!"
+#: src/net/ea/chathandler.cpp:374
+msgid "All whispers ignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
+#: src/net/ea/chathandler.cpp:385
+msgid "All whispers unignored."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
+#: src/net/ea/chathandler.cpp:389
+msgid "All whispers unignore failed."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
+#: src/net/ea/gamehandler.cpp:92
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Game"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
+#: src/net/ea/gamehandler.cpp:104
+msgid "Request to quit denied!"
 msgstr ""
 
 #: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
@@ -4396,418 +4664,414 @@ msgstr ""
 msgid "Guild level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:185
 #, c-format
 msgid "Online members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:187
 #, c-format
 msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:189
 #, c-format
 msgid "Average level: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:191
 #, c-format
 msgid "Guild exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:192
 #, c-format
 msgid "Guild next exp: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:194
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:412
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:416
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:420
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:424
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:428
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:464
 #, c-format
 msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:483
-msgid "You was kicked from guild."
+#: src/net/ea/guildhandler.cpp:499
+msgid "You were kicked from guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:512
 #, c-format
 msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:71
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:72
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
+#: src/net/ea/gui/partytab.cpp:73
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
+#: src/net/ea/gui/partytab.cpp:74
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:75
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
+#: src/net/ea/gui/partytab.cpp:85
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:92
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:96
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:98
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:99
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:102
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:103
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:107
+#: src/net/ea/gui/partytab.cpp:108
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:108
+#: src/net/ea/gui/partytab.cpp:109
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:111
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
+#: src/net/ea/gui/partytab.cpp:114
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:114
+#: src/net/ea/gui/partytab.cpp:115
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:148 src/net/ea/partyhandler.cpp:286
+#: src/net/ea/gui/partytab.cpp:149 src/net/ea/partyhandler.cpp:286
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:151 src/net/ea/partyhandler.cpp:296
+#: src/net/ea/gui/partytab.cpp:152 src/net/ea/partyhandler.cpp:296
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:154 src/net/ea/partyhandler.cpp:306
+#: src/net/ea/gui/partytab.cpp:155 src/net/ea/partyhandler.cpp:306
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:157
+#: src/net/ea/gui/partytab.cpp:158
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:187 src/net/ea/partyhandler.cpp:248
+#: src/net/ea/gui/partytab.cpp:188 src/net/ea/partyhandler.cpp:248
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:190 src/net/ea/partyhandler.cpp:258
+#: src/net/ea/gui/partytab.cpp:191 src/net/ea/partyhandler.cpp:258
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:193 src/net/ea/partyhandler.cpp:268
+#: src/net/ea/gui/partytab.cpp:194 src/net/ea/partyhandler.cpp:268
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:196
+#: src/net/ea/gui/partytab.cpp:197
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:407
+#: src/net/ea/inventoryhandler.cpp:404
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:580
+#: src/net/ea/inventoryhandler.cpp:572
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:131
+#: src/net/ea/loginhandler.cpp:132
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
+#: src/net/ea/loginhandler.cpp:135 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:137
+#: src/net/ea/loginhandler.cpp:138
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
+#: src/net/ea/loginhandler.cpp:141 src/net/ea/loginhandler.cpp:252
 #: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:205
+#: src/net/ea/loginhandler.cpp:214
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:208
+#: src/net/ea/loginhandler.cpp:217
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:211
+#: src/net/ea/loginhandler.cpp:220
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:214
+#: src/net/ea/loginhandler.cpp:223
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:217
+#: src/net/ea/loginhandler.cpp:226
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:221
+#: src/net/ea/loginhandler.cpp:230
 msgid "Client too old."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:224
+#: src/net/ea/loginhandler.cpp:233
 #, 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/ea/loginhandler.cpp:231
+#: src/net/ea/loginhandler.cpp:240
 msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:234
+#: src/net/ea/loginhandler.cpp:243
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:240
+#: src/net/ea/loginhandler.cpp:249
 msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/ea/partyhandler.cpp:83
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:140
+#: src/net/ea/partyhandler.cpp:139
 #, c-format
 msgid "%s has joined your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:176
+#: src/net/ea/partyhandler.cpp:175
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:181
+#: src/net/ea/partyhandler.cpp:180
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:186
+#: src/net/ea/partyhandler.cpp:185
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:191
+#: src/net/ea/partyhandler.cpp:190
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:196
+#: src/net/ea/partyhandler.cpp:195
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:356
+#: src/net/ea/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:372
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:449
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:95 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:315
 msgid "You are dead."
 msgstr "您已經死亡。"
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:316
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "我們很�憾的通知您，您的角色已經在戰鬥中被殺了。"
 
-#: src/net/ea/playerhandler.cpp:98 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:318
 msgid "You are not that alive anymore."
 msgstr "您��是那麼有活力。"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:319
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "殘酷的死神用冰冷的手正在抽出你的�魂。"
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:320
 msgid "Game Over!"
 msgstr "�戲���"
 
-#: src/net/ea/playerhandler.cpp:101
+#: src/net/ea/playerhandler.cpp:103
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:321
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr "�，孩�。您的角色並沒有真的死掉。他...呃...去了更好的地方。"
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:323
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr "您想讓敵人的武器�入您的喉嚨好折斷它的計畫失敗了。"
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:325
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:325
 msgid "I guess this did not run too well."
 msgstr "我猜這並沒有跑得很好"
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:326
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:326
 msgid "Do you want your possessions identified?"
 msgstr "您想�鑑定你的財產嗎？"
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:327
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:327
 msgid "Sadly, no trace of you was ever found..."
 msgstr "很悲傷的，沒有人發�你的蹤跡..."
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:329
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:329
 msgid "Annihilated."
 msgstr "�飛煙滅了。"
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:330
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:330
 msgid "Looks like you got your head handed to you."
 msgstr "看起來你把你的頭拿在手上。"
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:332
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:332
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "你�被幹掉啦!!!躺在地上一次�一次!!"
 
-#: src/net/ea/playerhandler.cpp:119
+#: src/net/ea/playerhandler.cpp:121
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:122
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:123
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:124
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:125
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:126
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:127
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:128
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:129
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:130
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:131
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/ea/playerhandler.cpp:133
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:134
 msgid "You're pining for the fjords."
 msgstr ""
 
 #: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
 msgid "Message"
 msgstr ""
 
@@ -4821,160 +5085,160 @@ msgstr ""
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:453
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:459
 #, c-format
 msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:505
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:623
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:149
+#: src/net/ea/specialhandler.cpp:143
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:152
+#: src/net/ea/specialhandler.cpp:146
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:155
+#: src/net/ea/specialhandler.cpp:149
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:158
+#: src/net/ea/specialhandler.cpp:152
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:161
+#: src/net/ea/specialhandler.cpp:155
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:164
+#: src/net/ea/specialhandler.cpp:158
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:196
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:200
+#: src/net/ea/specialhandler.cpp:193
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:203
+#: src/net/ea/specialhandler.cpp:196
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:206
+#: src/net/ea/specialhandler.cpp:199
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:209
+#: src/net/ea/specialhandler.cpp:202
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:220
+#: src/net/ea/specialhandler.cpp:213
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:223
+#: src/net/ea/specialhandler.cpp:216
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:226
+#: src/net/ea/specialhandler.cpp:219
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:128
+#: src/net/ea/tradehandler.cpp:105 src/net/manaserv/tradehandler.cpp:128
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s 請求交易, 是�接�?"
 
-#: src/net/ea/tradehandler.cpp:130
+#: src/net/ea/tradehandler.cpp:135
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:134
+#: src/net/ea/tradehandler.cpp:139
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:138
+#: src/net/ea/tradehandler.cpp:143
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:146
+#: src/net/ea/tradehandler.cpp:149
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:156
+#: src/net/ea/tradehandler.cpp:159
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:169
+#: src/net/ea/tradehandler.cpp:172
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:231
+#: src/net/ea/tradehandler.cpp:237
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:236
+#: src/net/ea/tradehandler.cpp:242
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:241
+#: src/net/ea/tradehandler.cpp:247
 msgid "Failed adding item. You can't trade this item."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:245
+#: src/net/ea/tradehandler.cpp:251
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:264 src/net/manaserv/tradehandler.cpp:160
+#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
 msgid "Trade canceled."
 msgstr "交易已�消。"
 
-#: src/net/ea/tradehandler.cpp:275 src/net/manaserv/tradehandler.cpp:167
+#: src/net/ea/tradehandler.cpp:281 src/net/manaserv/tradehandler.cpp:167
 msgid "Trade completed."
 msgstr "交易已完�。"
 
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:265
 msgid "Strength"
 msgstr "力�"
 
@@ -4983,7 +5247,7 @@ msgstr "力�"
 msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:266
 msgid "Agility"
 msgstr "��"
 
@@ -4992,7 +5256,7 @@ msgstr "��"
 msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:269
 msgid "Dexterity"
 msgstr "閃躲"
 
@@ -5001,7 +5265,7 @@ msgstr "閃躲"
 msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:267
 msgid "Vitality"
 msgstr "體力"
 
@@ -5010,7 +5274,7 @@ msgstr "體力"
 msgid "Vitality %+.1f"
 msgstr ""
 
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:268
 msgid "Intelligence"
 msgstr "智力"
 
@@ -5280,41 +5544,41 @@ msgstr ""
 msgid "Unable to sell unsellable item."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Strength %+d"
 msgstr "力� %+d"
 
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Agility %+d"
 msgstr "�� %+d"
 
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Vitality %+d"
 msgstr "體力 %+d"
 
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Intelligence %+d"
 msgstr "智力 %+d"
 
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Dexterity %+d"
 msgstr "閃躲 %+d"
 
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
 #, c-format
 msgid "Luck %+d"
 msgstr "幸�  %+d"
 
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
 msgstr ""
 
@@ -5322,129 +5586,131 @@ msgstr ""
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
 msgstr "和伺�器失去連線"
 
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:270
 msgid "Luck"
 msgstr "幸�"
 
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:273
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:275
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:277
 #, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:279
 #, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:281
 #, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:282
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:284
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:286
 msgid "Attack Range"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:152
+#: src/net/tmwa/generalhandler.cpp:288
+msgid "Damage per sec."
+msgstr ""
+
+#: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:356
+#: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:426
+#: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:171
+#: src/net/tmwa/partyhandler.cpp:172
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s �在您的隊�中�"
 
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:480
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:500
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:542
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:545
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:244
 #: src/resources/monsterdb.cpp:84
 msgid "unnamed"
 msgstr "未知物�"
 
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Attack %+d"
 msgstr "攻擊 %+d"
 
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Defense %+d"
 msgstr "防禦 %+d"
 
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "HP %+d"
 msgstr "體力%+d"
 
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "MP %+d"
 msgstr "魔力%+d"
 
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:167
 msgid "Unknown item"
 msgstr "�明的物�"
-
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3289aed66..7e7d60886 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -167,6 +167,8 @@ SET(SRCS
     gui/widgets/listbox.cpp
     gui/widgets/listbox.h
     gui/widgets/mouseevent.h
+    gui/widgets/namesmodel.cpp
+    gui/widgets/namesmodel.h
     gui/widgets/passwordfield.cpp
     gui/widgets/passwordfield.h
     gui/widgets/playerbox.cpp
@@ -197,6 +199,8 @@ SET(SRCS
     gui/widgets/shortcutcontainer.h
     gui/widgets/slider.cpp
     gui/widgets/slider.h
+    gui/widgets/sliderlist.cpp
+    gui/widgets/sliderlist.h
     gui/widgets/tab.cpp
     gui/widgets/tab.h
     gui/widgets/tabbedarea.cpp
@@ -327,6 +331,8 @@ SET(SRCS
     gui/setup_players.h
     gui/setup_video.cpp
     gui/setup_video.h
+    gui/setup_visual.cpp
+    gui/setup_visual.h
     gui/sdlfont.cpp
     gui/sdlfont.h
     gui/shopwindow.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 3fad9f3ce..06b457e4b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -170,6 +170,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/listbox.cpp \
 	      gui/widgets/listbox.h \
 	      gui/widgets/mouseevent.h \
+	      gui/widgets/namesmodel.cpp \
+	      gui/widgets/namesmodel.h \
 	      gui/widgets/passwordfield.cpp \
 	      gui/widgets/passwordfield.h \
 	      gui/widgets/playerbox.cpp \
@@ -200,6 +202,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/shortcutcontainer.h \
 	      gui/widgets/slider.cpp \
 	      gui/widgets/slider.h \
+	      gui/widgets/sliderlist.cpp \
+	      gui/widgets/sliderlist.h \
 	      gui/widgets/tab.cpp \
 	      gui/widgets/tab.h \
 	      gui/widgets/tabbedarea.cpp \
@@ -330,6 +334,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/setup_relations.h \
 	      gui/setup_video.cpp \
 	      gui/setup_video.h \
+	      gui/setup_visual.cpp \
+	      gui/setup_visual.h \
 	      gui/sdlfont.cpp \
 	      gui/sdlfont.h \
 	      gui/shopwindow.cpp \
diff --git a/src/actorspritelistener.h b/src/actorspritelistener.h
index 314825fc7..7fdb99dc4 100644
--- a/src/actorspritelistener.h
+++ b/src/actorspritelistener.h
@@ -30,7 +30,8 @@ class ActorSpriteListener
         /**
          * Destructor.
          */
-        virtual ~ActorSpriteListener() {}
+        virtual ~ActorSpriteListener()
+        { }
 
         /**
          * Called when the ActorSprite has been destroyed. The listener will
diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp
index 803a30e7e..758a452b1 100644
--- a/src/actorspritemanager.cpp
+++ b/src/actorspritemanager.cpp
@@ -203,11 +203,7 @@ ActorSpriteManager::ActorSpriteManager() :
 
 ActorSpriteManager::~ActorSpriteManager()
 {
-    config.removeListener("targetDeadPlayers", this);
-    config.removeListener("targetOnlyReachable", this);
-    config.removeListener("cyclePlayers", this);
-    config.removeListener("cycleMonsters", this);
-    config.removeListener("extMouseTargeting", this);
+    config.removeListeners(this);
     storeAttackList();
     clear();
 }
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 11329b321..6b791fdd4 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -214,7 +214,12 @@ bool AnimatedSprite::updateCurrentAnimation(unsigned int time)
             }
         }
         if (fail)
-            mFrameTime = mFrame->delay + 1;
+        {
+            if (mFrame)
+                mFrameTime = mFrame->delay + 1;
+            else
+                mFrameTime ++;
+        }
     }
     return true;
 }
diff --git a/src/being.cpp b/src/being.cpp
index e1cb9b0ae..664eecd1d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -1380,8 +1380,10 @@ void Being::drawEmotion(Graphics *graphics, int offsetX, int offsetY)
 
     if (emotionIndex >= 0 && emotionIndex <= EmoteDB::getLast())
     {
-        if (EmoteDB::getAnimation(emotionIndex))
+        if (EmoteDB::getAnimation(emotionIndex, true))
             EmoteDB::getAnimation(emotionIndex)->draw(graphics, px, py);
+        else
+            mEmotion = 0;
     }
 }
 
@@ -2320,7 +2322,7 @@ void Being::recalcSpritesOrder()
             int val = slotRemap.at(slot);
             int id = 0;
 
-            if ((int)mSpriteIDs.size() > val)
+            if (static_cast<int>(mSpriteIDs.size()) > val)
                 id = mSpriteIDs[val];
 
             int idx = -1;
@@ -2525,7 +2527,6 @@ void Being::saveComment(const std::string &name,
 
 void Being::setState(Uint8 state)
 {
-    mAdvanced = true;
     bool shop = (state & FLAG_SHOP);
     bool away = (state & FLAG_AWAY);
     bool inactive = (state & FLAG_INACTIVE);
@@ -2548,6 +2549,7 @@ void Being::setEmote(Uint8 emotion, int emote_time)
     if ((emotion & FLAG_SPECIAL) == FLAG_SPECIAL)
     {
         setState(emotion);
+        mAdvanced = true;
     }
     else
     {
diff --git a/src/chatlogger.cpp b/src/chatlogger.cpp
index b8418edda..4c4f2ce83 100644
--- a/src/chatlogger.cpp
+++ b/src/chatlogger.cpp
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "chatlogger.h"
diff --git a/src/chatlogger.h b/src/chatlogger.h
index bb02d8127..26fa2e37f 100644
--- a/src/chatlogger.h
+++ b/src/chatlogger.h
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef M_CHATLOGGER_H
diff --git a/src/client.cpp b/src/client.cpp
index fa8f032fa..95e49c6aa 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -276,7 +276,6 @@ Client::Client(const Options &options):
 
 void Client::testsInit()
 {
-    printf ("testInit\n");
     if (!mOptions.test.empty())
     {
         gameInit();
@@ -342,6 +341,10 @@ void Client::gameInit()
     textdomain("manaplus");
 #endif
 
+#if defined(WIN32) || defined(__APPLE__)
+    putenv("SDL_VIDEO_CENTERED=1");
+#endif
+
     chatLogger = new ChatLogger;
     if (mOptions.chatLogDir == "")
         chatLogger->setBaseLogDir(mLocalDataDir + std::string("/logs/"));
@@ -360,7 +363,7 @@ void Client::gameInit()
     logger->log1("Initializing SDL...");
     if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0)
     {
-        logger->error(strprintf("Could not initialize SDL: %s",
+        logger->safeError(strprintf("Could not initialize SDL: %s",
                       SDL_GetError()));
     }
     atexit(SDL_Quit);
@@ -552,13 +555,17 @@ void Client::gameInit()
             if (!mainGraphics->setVideoMode(oldWidth, oldHeight, bpp,
                 oldFullscreen, hwaccel, enableResize, noFrame))
             {
-                logger->error(strprintf("Couldn't restore %dx%dx%d "
+                logger->safeError(strprintf("Couldn't restore %dx%dx%d "
                     "video mode: %s", oldWidth, oldHeight, bpp,
                     SDL_GetError()));
             }
         }
     }
 
+    applyGrabMode();
+    applyGamma();
+    applyVSync();
+
     // Initialize for drawing
     mainGraphics->_beginDraw();
 
@@ -660,6 +667,9 @@ void Client::gameInit()
     setFramerate(fpsLimit);
     config.addListener("fpslimit", this);
     config.addListener("guialpha", this);
+    config.addListener("gamma", this);
+    config.addListener("particleEmitterSkip", this);
+    config.addListener("vsync", this);
     setGuiAlpha(config.getFloatValue("guialpha"));
 
     optionChanged("fpslimit");
@@ -697,8 +707,7 @@ void Client::gameClear()
 {
     if (logger)
         logger->log1("Quitting1");
-    config.removeListener("fpslimit", this);
-    config.removeListener("guialpha", this);
+    config.removeListeners(this);
 
     SDL_RemoveTimer(mLogicCounterId);
     SDL_RemoveTimer(mSecondsCounterId);
@@ -866,7 +875,7 @@ int Client::gameExec()
             Net::getGeneralHandler()->flushNetwork();
 
         int k = 0;
-        while (lastTickTime != tick_time && k < 2)
+        while (lastTickTime != tick_time && k < 40)
         {
             if (gui)
                 gui->logic();
@@ -1094,6 +1103,7 @@ int Client::gameExec()
                 case STATE_WORLD_SELECT:
                     logger->log1("State: WORLD SELECT");
                     {
+                        TranslationManager::loadCurrentLang();
                         Worlds worlds = Net::getLoginHandler()->getWorlds();
 
                         if (worlds.empty())
@@ -1193,6 +1203,8 @@ int Client::gameExec()
                     if (!BeingInfo::unknown)
                         BeingInfo::unknown = new BeingInfo;
 
+                    TranslationManager::loadCurrentLang();
+
                     Event evt2(EVENT_STATECHANGE);
                     evt2.setInt("newState", STATE_LOAD_DATA);
                     evt2.setInt("oldState", mOldState);
@@ -1311,14 +1323,16 @@ int Client::gameExec()
 
                 case STATE_LOGIN_ERROR:
                     logger->log1("State: LOGIN ERROR");
-                    mCurrentDialog = new OkDialog(_("Error"), errorMessage);
+                    mCurrentDialog = new OkDialog(_("Error"),
+                        errorMessage, DIALOG_ERROR);
                     mCurrentDialog->addActionListener(&loginListener);
                     mCurrentDialog = nullptr; // OkDialog deletes itself
                     break;
 
                 case STATE_ACCOUNTCHANGE_ERROR:
                     logger->log1("State: ACCOUNT CHANGE ERROR");
-                    mCurrentDialog = new OkDialog(_("Error"), errorMessage);
+                    mCurrentDialog = new OkDialog(_("Error"),
+                        errorMessage, DIALOG_ERROR);
                     mCurrentDialog->addActionListener(&accountListener);
                     mCurrentDialog = nullptr; // OkDialog deletes itself
                     break;
@@ -1354,7 +1368,7 @@ int Client::gameExec()
                 case STATE_CHANGEPASSWORD_SUCCESS:
                     logger->log1("State: CHANGE PASSWORD SUCCESS");
                     mCurrentDialog = new OkDialog(_("Password Change"),
-                            _("Password changed successfully!"));
+                        _("Password changed successfully!"), DIALOG_ERROR);
                     mCurrentDialog->addActionListener(&accountListener);
                     mCurrentDialog = nullptr; // OkDialog deletes itself
                     loginData.password = loginData.newPassword;
@@ -1374,7 +1388,7 @@ int Client::gameExec()
                 case STATE_CHANGEEMAIL_SUCCESS:
                     logger->log1("State: CHANGE EMAIL SUCCESS");
                     mCurrentDialog = new OkDialog(_("Email Change"),
-                            _("Email changed successfully!"));
+                        _("Email changed successfully!"), DIALOG_ERROR);
                     mCurrentDialog->addActionListener(&accountListener);
                     mCurrentDialog = nullptr; // OkDialog deletes itself
                     break;
@@ -1395,7 +1409,7 @@ int Client::gameExec()
                     Net::getLoginHandler()->disconnect();
 
                     mCurrentDialog = new OkDialog(_("Unregister Successful"),
-                            _("Farewell, come back any time..."));
+                        _("Farewell, come back any time..."), DIALOG_ERROR);
                     loginData.clear();
                     //The errorlistener sets the state to STATE_CHOOSE_SERVER
                     mCurrentDialog->addActionListener(&errorListener);
@@ -1452,7 +1466,8 @@ int Client::gameExec()
                 case STATE_ERROR:
                     logger->log1("State: ERROR");
                     logger->log("Error: %s\n", errorMessage.c_str());
-                    mCurrentDialog = new OkDialog(_("Error"), errorMessage);
+                    mCurrentDialog = new OkDialog(_("Error"),
+                        errorMessage, DIALOG_ERROR);
                     mCurrentDialog->addActionListener(&errorListener);
                     mCurrentDialog = nullptr; // OkDialog deletes itself
                     Net::getGameHandler()->disconnect();
@@ -1484,6 +1499,19 @@ void Client::optionChanged(const std::string &name)
     else if (name == "guialpha")
     {
         setGuiAlpha(config.getFloatValue("guialpha"));
+        Image::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f);
+    }
+    else if (name == "gamma")
+    {
+        applyGamma();
+    }
+    else if (name == "particleEmitterSkip")
+    {
+        Particle::emitterSkip = config.getIntValue("particleEmitterSkip") + 1;
+    }
+    else if (name == "vsync")
+    {
+        applyVSync();
     }
 }
 
@@ -1665,6 +1693,7 @@ void Client::initServerConfig(std::string serverName)
     {
         fclose(configFile);
         serverConfig.init(configPath);
+        serverConfig.setDefaultValues(getConfigDefaults());
         logger->log("serverConfigPath: " + configPath);
     }
     initPacketLimiter();
@@ -2423,3 +2452,22 @@ void Client::resizeVideo(int width, int height, bool always)
         config.setValue("screenheight", height);
     }
 }
+
+void Client::applyGrabMode()
+{
+    SDL_WM_GrabInput(config.getBoolValue("grabinput")
+        ? SDL_GRAB_ON : SDL_GRAB_OFF);
+}
+
+void Client::applyGamma()
+{
+    float val = config.getFloatValue("gamma");
+    SDL_SetGamma(val, val, val);
+}
+
+void Client::applyVSync()
+{
+    int val = config.getIntValue("vsync");
+    if (val > 0 && val < 2)
+        SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, val);
+}
diff --git a/src/client.h b/src/client.h
index 6c93adbdf..54de27824 100644
--- a/src/client.h
+++ b/src/client.h
@@ -273,6 +273,12 @@ public:
 
     static bool isTmw();
 
+    static void applyGrabMode();
+
+    void applyGamma();
+
+    void applyVSync();
+
     void optionChanged(const std::string &name);
 
     void action(const gcn::ActionEvent &event);
diff --git a/src/commandhandler.h b/src/commandhandler.h
index cd25c234a..d399accf7 100644
--- a/src/commandhandler.h
+++ b/src/commandhandler.h
@@ -48,7 +48,8 @@ class CommandHandler
         /**
          * Destructor
          */
-        ~CommandHandler() {}
+        ~CommandHandler()
+        { }
 
         /**
          * Parse and handle the given command.
diff --git a/src/configlistener.h b/src/configlistener.h
index e4bbbee53..28540c564 100644
--- a/src/configlistener.h
+++ b/src/configlistener.h
@@ -37,7 +37,8 @@ class ConfigListener
         /**
          * Destructor.
          */
-        virtual ~ConfigListener() {}
+        virtual ~ConfigListener()
+        { }
 
         /**
          * Called when an option changed. The config listener will have to be
diff --git a/src/configuration.cpp b/src/configuration.cpp
index c4f1cc360..624cf7865 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -217,6 +217,11 @@ int Configuration::getIntValue(const std::string &key) const
                         defaultValue = 0;
                     }
                 }
+                else if (itdef->second->getType() == VariableData::DATA_FLOAT)
+                {
+                    defaultValue = static_cast<int>(
+                        (static_cast<FloatData*>(itdef->second))->getData());
+                }
             }
             else
             {
@@ -321,11 +326,38 @@ float Configuration::getFloatValue(const std::string &key) const
         {
             DefaultsData::const_iterator itdef = mDefaultsData->find(key);
 
-            if (itdef != mDefaultsData->end() && itdef->second
-                && itdef->second->getType() == VariableData::DATA_FLOAT)
+            if (itdef != mDefaultsData->end() && itdef->second)
             {
-                defaultValue = static_cast<float>(
-                    (static_cast<FloatData*>(itdef->second))->getData());
+                if (itdef->second->getType() == VariableData::DATA_FLOAT)
+                {
+                    defaultValue = static_cast<float>(
+                        (static_cast<FloatData*>(itdef->second))->getData());
+                }
+                else if (itdef->second->getType()
+                         == VariableData::DATA_STRING)
+                {
+                    defaultValue = atof((static_cast<StringData*>(
+                        itdef->second))->getData().c_str());
+                }
+                else if (itdef->second->getType()
+                         == VariableData::DATA_BOOL)
+                {
+                    if ((static_cast<BoolData*>(
+                        itdef->second))->getData())
+                    {
+                        defaultValue = 1;
+                    }
+                    else
+                    {
+                        defaultValue = 0;
+                    }
+                }
+                else if (itdef->second->getType()
+                         == VariableData::DATA_INT)
+                {
+                    defaultValue = (static_cast<IntData*>(
+                        itdef->second))->getData();
+                }
             }
             else
             {
@@ -385,6 +417,18 @@ bool Configuration::getBoolValue(const std::string &key) const
                         defaultValue = false;
                     }
                 }
+                if (itdef->second->getType() == VariableData::DATA_FLOAT)
+                {
+                    if (static_cast<int>((static_cast<FloatData*>(
+                        itdef->second))->getData()) != 0)
+                    {
+                        defaultValue = true;
+                    }
+                    else
+                    {
+                        defaultValue = false;
+                    }
+                }
             }
             else
             {
@@ -528,7 +572,8 @@ void ConfigurationObject::writeToXML(XmlTextWriterPtr writer)
              elt_it != it->second.end(); ++elt_it)
         {
             xmlTextWriterStartElement(writer, BAD_CAST name);
-            (*elt_it)->writeToXML(writer);
+            if (*elt_it)
+                (*elt_it)->writeToXML(writer);
             xmlTextWriterEndElement(writer);
         }
 
@@ -572,14 +617,22 @@ void Configuration::write()
     xmlFreeTextWriter(writer);
 }
 
-void Configuration::addListener(
-        const std::string &key, ConfigListener *listener)
+void Configuration::addListener(const std::string &key,
+                                ConfigListener *listener)
 {
     mListenerMap[key].push_front(listener);
 }
 
-void Configuration::removeListener(
-        const std::string &key, ConfigListener *listener)
+void Configuration::removeListener(const std::string &key,
+                                   ConfigListener *listener)
 {
     mListenerMap[key].remove(listener);
 }
+
+void Configuration::removeListeners(ConfigListener *listener)
+{
+    ListenerMapIterator it = mListenerMap.begin();
+    ListenerMapIterator it_end = mListenerMap.end();
+    for (; it != it_end; ++ it)
+        (it->second).remove(listener);
+}
diff --git a/src/configuration.h b/src/configuration.h
index 122badfd5..2715ea59c 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -248,6 +248,8 @@ class Configuration : public ConfigurationObject
          */
         void removeListener(const std::string &key, ConfigListener *listener);
 
+        void removeListeners(ConfigListener *listener);
+
         void setValue(const std::string &key, const std::string &value);
 
         void setSilent(const std::string &key, const std::string &value);
diff --git a/src/defaults.cpp b/src/defaults.cpp
index a439701a3..87771c427 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -226,6 +226,18 @@ DefaultsData* getConfigDefaults()
     AddDEF(configData, "enableresize", true);
     AddDEF(configData, "noframe", false);
     AddDEF(configData, "groupFriends", true);
+    AddDEF(configData, "grabinput", false);
+    AddDEF(configData, "gamma", 1);
+    AddDEF(configData, "vsync", 0);
+    AddDEF(configData, "enableBuggyServers", true);
+    AddDEF(configData, "soundwhisper", "newmessage");
+    AddDEF(configData, "soundhighlight", "reminder");
+    AddDEF(configData, "soundglobal", "email");
+    AddDEF(configData, "sounderror", "error");
+    AddDEF(configData, "soundtrade", "start");
+    AddDEF(configData, "soundinfo", "notify");
+    AddDEF(configData, "soundrequest", "attention");
+    AddDEF(configData, "soundguild", "newmessage");
     return configData;
 }
 
@@ -243,6 +255,7 @@ DefaultsData* getBrandingDefaults()
     AddDEF(brandingData, "defaultServerType", "tmwathena");
     AddDEF(brandingData, "onlineServerList",
            "http://manaplus.evolonline.org/serverlist.xml");
+    AddDEF(brandingData, "onlineServerFile", "serverlistplus.xml");
     AddDEF(brandingData, "appShort", "mana");
     AddDEF(brandingData, "defaultUpdateHost", "");
     AddDEF(brandingData, "helpPath", "");
@@ -259,6 +272,8 @@ DefaultsData* getBrandingDefaults()
     AddDEF(brandingData, "guiThemePath", "themes/");
     AddDEF(brandingData, "fontsPath", "fonts/");
 
+    AddDEF(brandingData, "systemsounds", "sfx/system/");
+
     AddDEF(brandingData, "wallpaperFile", "");
     AddDEF(brandingData, "dataPath", "");
     return brandingData;
diff --git a/src/dropshortcut.cpp b/src/dropshortcut.cpp
index 5b01f7f4f..410af8739 100644
--- a/src/dropshortcut.cpp
+++ b/src/dropshortcut.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "dropshortcut.h"
diff --git a/src/dropshortcut.h b/src/dropshortcut.h
index 31c20677d..6a0ef49e9 100644
--- a/src/dropshortcut.h
+++ b/src/dropshortcut.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef DROPSHORTCUT_H
diff --git a/src/effectmanager.cpp b/src/effectmanager.cpp
index de12ecaa5..b52d2ac22 100644
--- a/src/effectmanager.cpp
+++ b/src/effectmanager.cpp
@@ -2,6 +2,7 @@
  *  An effects manager
  *  Copyright (C) 2008  Fate <fate.tmw@googlemail.com>
  *  Copyright (C) 2008  Chuck Miller <shadowmil@gmail.com>
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/effectmanager.h b/src/effectmanager.h
index df19a0040..7b71069fe 100644
--- a/src/effectmanager.h
+++ b/src/effectmanager.h
@@ -2,6 +2,7 @@
  *  An effects manager
  *  Copyright (C) 2008  Fate <fate.tmw@googlemail.com>
  *  Copyright (C) 2008  Chuck Miller <shadowmil@gmail.com>
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -24,6 +25,7 @@
 
 #include <list>
 #include <string>
+#include <vector>
 
 class Being;
 
diff --git a/src/emoteshortcut.cpp b/src/emoteshortcut.cpp
index 352c373b5..d0b5d9be5 100644
--- a/src/emoteshortcut.cpp
+++ b/src/emoteshortcut.cpp
@@ -1,6 +1,7 @@
 /*
  *  Extended support for activating emotes
  *  Copyright (C) 2009  Aethyra Development Team
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/emoteshortcut.h b/src/emoteshortcut.h
index d7f1e7b79..c47569738 100644
--- a/src/emoteshortcut.h
+++ b/src/emoteshortcut.h
@@ -1,6 +1,7 @@
 /*
  *  Extended support for activating emotes
  *  Copyright (C) 2009  Aethyra Development Team
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/equipment.h b/src/equipment.h
index 50acd60d3..ed38d32ca 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -66,8 +66,11 @@ class Equipment
         {
             public:
                 virtual Item *getEquipment(int index) const = 0;
+
                 virtual void clear() = 0;
-                virtual ~Backend() { }
+
+                virtual ~Backend()
+                { }
         };
 
         /**
diff --git a/src/game.cpp b/src/game.cpp
index 6adf62f12..70d794ce8 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -561,7 +561,7 @@ void Game::logic()
             {
                 errorMessage = _("The connection to the server was lost.");
                 disconnectedDialog = new OkDialog(_("Network Error"),
-                                                  errorMessage, false);
+                    errorMessage, DIALOG_ERROR, false);
                 disconnectedDialog->addActionListener(&errorListener);
                 disconnectedDialog->requestMoveToTop();
             }
@@ -803,12 +803,13 @@ bool Game::handleSwitchKeys(SDL_Event &event, bool &used)
                     used = true;
             }
         }
-        if (dialog)
+        if (dialog && !dialog->isInputFocused())
         {
-            if (keyboard.isActionActive(keyboard.KEY_MOVE_UP))
-                dialog->move(1);
-            else if (keyboard.isActionActive(keyboard.KEY_MOVE_DOWN))
-                dialog->move(-1);
+            if (keyboard.isActionActive(keyboard.KEY_MOVE_UP)
+                || keyboard.isActionActive(keyboard.KEY_MOVE_DOWN))
+            {
+                dialog->refocus();
+            }
         }
     }
 
@@ -1316,7 +1317,8 @@ void Game::handleMoveAndAttack(SDL_Event &event, bool wasDown)
     if (player_node->isAlive() && (!Being::isTalking()
         || keyboard.getKeyIndex(event.key.keysym.sym)
         == KeyboardConfig::KEY_TALK)
-        && chatWindow && !chatWindow->isInputFocused() && !quitDialog)
+        && chatWindow && !chatWindow->isInputFocused()
+        && !InventoryWindow::isAnyInputFocused() && !quitDialog)
     {
         // Get the state of the keyboard keys
         keyboard.refreshActiveKeys();
@@ -1420,7 +1422,7 @@ void Game::handleMoveAndAttack(SDL_Event &event, bool wasDown)
                     Net::getPlayerHandler()->setDirection(direction);
                 }
             }
-            direction = 0;
+//            direction = 0;
         }
         else
         {
@@ -1695,7 +1697,7 @@ void Game::handleInput()
                 {
                     if (emoteShortcut)
                         emoteShortcut->useEmote(emotion);
-                    used = true;
+//                    used = true;
                     setValidSpeed();
                     return;
                 }
@@ -1796,8 +1798,9 @@ void Game::changeMap(const std::string &mapPath)
     if (!newMap)
     {
         logger->log("Error while loading %s", fullMap.c_str());
-        new OkDialog(_("Could Not Load Map"),
-                     strprintf(_("Error while loading %s"), fullMap.c_str()));
+        new OkDialog(_("Could Not Load Map"), strprintf(
+            _("Error while loading %s"), fullMap.c_str()),
+            DIALOG_ERROR, false);
     }
 
     if (mCurrentMap)
diff --git a/src/graphics.cpp b/src/graphics.cpp
index e98b1a283..e6841fa5c 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -112,7 +112,7 @@ bool Graphics::setVideoMode(int w, int h, int bpp, bool fs,
     if (mTarget->format)
     {
         logger->log("Bits per pixel: %d", mTarget->format->BytesPerPixel);
-        bpp = mTarget->format->BytesPerPixel;
+//        bpp = mTarget->format->BytesPerPixel;
     }
 
     const SDL_VideoInfo *vi = SDL_GetVideoInfo();
@@ -845,7 +845,8 @@ void Graphics::fillRectangle(const gcn::Rectangle& rectangle)
             case 1:
                 for (y = y1; y < y2; y++)
                 {
-                    Uint8 *p = (Uint8 *)mTarget->pixels + y * mTarget->pitch;
+                    Uint8 *p = static_cast<Uint8 *>(mTarget->pixels)
+                        + y * mTarget->pitch;
                     for (x = x1; x < x2; x++)
                         *(p + x) = pixel;
                 }
@@ -853,12 +854,14 @@ void Graphics::fillRectangle(const gcn::Rectangle& rectangle)
             case 2:
                 for (y = y1; y < y2; y++)
                 {
-                    Uint8 *p0 = (Uint8 *)mTarget->pixels + y * mTarget->pitch;
+                    Uint8 *p0 = static_cast<Uint8 *>(mTarget->pixels)
+                        + y * mTarget->pitch;
                     for (x = x1; x < x2; x++)
                     {
                         Uint8 *p = p0 + x * 2;
-                        *(Uint16 *)p = gcn::SDLAlpha16(
-                            pixel, *(Uint32 *)p, mColor.a, mTarget->format);
+                        *reinterpret_cast<Uint16 *>(p) = gcn::SDLAlpha16(
+                            pixel, *reinterpret_cast<Uint32 *>(p),
+                            mColor.a, mTarget->format);
                     }
                 }
                 break;
@@ -871,7 +874,8 @@ void Graphics::fillRectangle(const gcn::Rectangle& rectangle)
 
                 for (y = y1; y < y2; y++)
                 {
-                    Uint8 *p0 = (Uint8 *)mTarget->pixels + y * mTarget->pitch;
+                    Uint8 *p0 = static_cast<Uint8 *>(mTarget->pixels)
+                        + y * mTarget->pitch;
                     for (x = x1; x < x2; x++)
                     {
                         Uint8 *p = p0 + x * 3;
@@ -896,18 +900,19 @@ void Graphics::fillRectangle(const gcn::Rectangle& rectangle)
                 const unsigned a1 = (255 - mColor.a);
                 for (y = y1; y < y2; y++)
                 {
-                    Uint8 *p0 = (Uint8 *)mTarget->pixels + y * mTarget->pitch;
+                    Uint8 *p0 = static_cast<Uint8 *>(mTarget->pixels)
+                        + y * mTarget->pitch;
                     for (x = x1; x < x2; x++)
                     {
                         Uint8 *p = p0 + x * 4;
-                        Uint32 dst = *(Uint32 *)p;
+                        Uint32 dst = *reinterpret_cast<Uint32 *>(p);
                         const unsigned int b = (pb + (dst & 0xff) * a1) >> 8;
                         const unsigned int g = (pg + (dst & 0xff00) * a1) >> 8;
                         const unsigned int r = (pr
                             + (dst & 0xff0000) * a1) >> 8;
 
-                        *(Uint32 *)p = ((b & 0xff) | (g & 0xff00)
-                            | (r & 0xff0000));
+                        *reinterpret_cast<Uint32 *>(p) = ((b & 0xff)
+                            | (g & 0xff00) | (r & 0xff0000));
                     }
                 }
                 break;
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index 4a092ab55..2739978cb 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "botcheckerwindow.h"
diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h
index 86d5ef290..b1075686f 100644
--- a/src/gui/botcheckerwindow.h
+++ b/src/gui/botcheckerwindow.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef BOTCHECKER_H
diff --git a/src/gui/changeemaildialog.cpp b/src/gui/changeemaildialog.cpp
index 518ed3da1..1a468d44f 100644
--- a/src/gui/changeemaildialog.cpp
+++ b/src/gui/changeemaildialog.cpp
@@ -154,7 +154,8 @@ void ChangeEmailDialog::action(const gcn::ActionEvent &event)
             else if (error == 2)
                 mWrongDataNoticeListener->setTarget(this->mSecondEmailField);
 
-            OkDialog *dlg = new OkDialog(_("Error"), errorMsg.str());
+            OkDialog *dlg = new OkDialog(_("Error"),
+                errorMsg.str(), DIALOG_ERROR);
             if (dlg)
                 dlg->addActionListener(mWrongDataNoticeListener);
         }
diff --git a/src/gui/changepassworddialog.cpp b/src/gui/changepassworddialog.cpp
index 8082b8d58..a58d8616b 100644
--- a/src/gui/changepassworddialog.cpp
+++ b/src/gui/changepassworddialog.cpp
@@ -144,7 +144,8 @@ void ChangePasswordDialog::action(const gcn::ActionEvent &event)
             else if (error == 3)
                 mWrongDataNoticeListener->setTarget(this->mSecondPassField);
 
-            OkDialog *dlg = new OkDialog(_("Error"), errorMsg.str());
+            OkDialog *dlg = new OkDialog(_("Error"),
+                errorMsg.str(), DIALOG_ERROR);
             dlg->addActionListener(mWrongDataNoticeListener);
         }
         else
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index 8d4767a15..124476f1c 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -270,8 +270,8 @@ void CharCreateDialog::action(const gcn::ActionEvent &event)
         else
         {
             new OkDialog(_("Error"),
-                         _("Your name needs to be at least 4 characters."),
-                         true,  this);
+                _("Your name needs to be at least 4 characters."),
+                DIALOG_ERROR, true,  this);
         }
     }
     else if (id == "cancel")
@@ -474,8 +474,11 @@ void CharCreateDialog::updateHair()
     mHairStyle %= Being::getNumOfHairstyles();
     if (mHairStyle < 0)
         mHairStyle += Being::getNumOfHairstyles();
-    if (mHairStyle < (signed)minHairStyle || mHairStyle > (signed)maxHairStyle)
+    if (mHairStyle < static_cast<signed>(minHairStyle)
+        || mHairStyle > static_cast<signed>(maxHairStyle))
+    {
         mHairStyle = minHairStyle;
+    }
     const ItemInfo &item = ItemDB::get(-mHairStyle);
     mHairStyleNameLabel->setCaption(item.getName());
     mHairStyleNameLabel->adjustSize();
@@ -483,8 +486,11 @@ void CharCreateDialog::updateHair()
     mHairColor %= ColorDB::getHairSize();
     if (mHairColor < 0)
         mHairColor += ColorDB::getHairSize();
-    if (mHairColor < (signed)minHairColor || mHairColor > (signed)maxHairColor)
+    if (mHairColor < static_cast<signed>(minHairColor)
+        || mHairColor > static_cast<signed>(maxHairColor))
+    {
         mHairColor = minHairColor;
+    }
     mHairColorNameLabel->setCaption(ColorDB::getHairColorName(mHairColor));
     mHairColorNameLabel->adjustSize();
 
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index d2b74a632..b1b8009a4 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -253,7 +253,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
         }
         else
         {
-            new OkDialog(_("Error"), _("Incorrect password"));
+            new OkDialog(_("Error"), _("Incorrect password"), DIALOG_ERROR);
         }
         mDeleteIndex = -1;
     }
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 69e4d703f..ac493b04e 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -133,7 +133,8 @@ const char *COLOR_NAME[14] =
 class ColorListModel : public gcn::ListModel
 {
 public:
-    virtual ~ColorListModel() { }
+    virtual ~ColorListModel()
+    { }
 
     virtual int getNumberOfElements()
     {
diff --git a/src/gui/confirmdialog.cpp b/src/gui/confirmdialog.cpp
index 22acf5116..a2fb7b6cc 100644
--- a/src/gui/confirmdialog.cpp
+++ b/src/gui/confirmdialog.cpp
@@ -97,7 +97,7 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
     }
     setVisible(true);
     yesButton->requestFocus();
-    sound.playGuiSfx("system/newmessage.ogg");
+    sound.playGuiSound(SOUND_REQUEST);
 }
 
 void ConfirmDialog::action(const gcn::ActionEvent &event)
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index b65068dc5..fa01b5aa8 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -390,7 +390,7 @@ void NetDebugTab::logic()
     if (player_node && player_node->getPingTime() != 0)
     {
         mPingLabel->setCaption(strprintf(_("Ping: %s ms"),
-            toString((int)player_node->getPingTime()).c_str()));
+            toString(static_cast<int>(player_node->getPingTime())).c_str()));
     }
     else
     {
diff --git a/src/gui/editdialog.cpp b/src/gui/editdialog.cpp
index 84f4f6ddf..1bd3ccbf5 100644
--- a/src/gui/editdialog.cpp
+++ b/src/gui/editdialog.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/editdialog.h"
diff --git a/src/gui/editdialog.h b/src/gui/editdialog.h
index ef260acfb..206a45079 100644
--- a/src/gui/editdialog.h
+++ b/src/gui/editdialog.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EDIT_DIALOG_H
diff --git a/src/gui/editserverdialog.cpp b/src/gui/editserverdialog.cpp
index 8a4a9579d..ca1afeaba 100644
--- a/src/gui/editserverdialog.cpp
+++ b/src/gui/editserverdialog.cpp
@@ -173,7 +173,7 @@ void EditServerDialog::action(const gcn::ActionEvent &event)
         {
             OkDialog *dlg = new OkDialog(_("Error"),
                 _("Please at least type both the address and the port "
-                  "of the server."));
+                  "of the server."), DIALOG_ERROR);
             dlg->addActionListener(this);
         }
         else
@@ -184,7 +184,8 @@ void EditServerDialog::action(const gcn::ActionEvent &event)
             mServer.name = mNameField->getText();
             mServer.description = mDescriptionField->getText();
             mServer.hostname = mServerAddressField->getText();
-            mServer.port = (short) atoi(mPortField->getText().c_str());
+            mServer.port = static_cast<short>(atoi(
+                mPortField->getText().c_str()));
 
             if (mTypeField)
             {
diff --git a/src/gui/editserverdialog.h b/src/gui/editserverdialog.h
index 6035b0e50..4ad6b8fcb 100644
--- a/src/gui/editserverdialog.h
+++ b/src/gui/editserverdialog.h
@@ -44,7 +44,8 @@ class TypeListModel;
 class TypeListModel : public gcn::ListModel
 {
     public:
-        TypeListModel() {}
+        TypeListModel()
+        { }
 
         /**
          * Used to get number of line in the list
diff --git a/src/gui/emotepopup.cpp b/src/gui/emotepopup.cpp
index a286f78e8..39017ac91 100644
--- a/src/gui/emotepopup.cpp
+++ b/src/gui/emotepopup.cpp
@@ -197,12 +197,15 @@ void EmotePopup::recalculateSize()
         ++mRowCount;
 
     if (mRowCount)
+    {
         mColumnCount = emoteCount / mRowCount;
+        if (emoteCount % mRowCount > 0)
+            ++ mColumnCount;
+    }
     else
+    {
         mColumnCount = 1;
-
-    if (emoteCount % mRowCount > 0)
-        ++mColumnCount;
+    }
 
     setContentSize(mColumnCount * gridWidth, mRowCount * gridHeight);
 }
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 275bf19bb..89063c3dc 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -407,8 +407,11 @@ void EquipmentWindow::loadSlot(XmlNodePtr slotNode, ImageSet *imageset)
     const int imageIndex = XML::getProperty(slotNode, "image", -1);
     Image *image = nullptr;
 
-    if (imageset && imageIndex >= 0 && imageIndex < (signed)imageset->size())
+    if (imageset && imageIndex >= 0 && imageIndex
+        < static_cast<signed>(imageset->size()))
+    {
         image = imageset->get(imageIndex);
+    }
 
     if (mBoxes[slot])
     {
@@ -510,8 +513,11 @@ void EquipmentWindow::addBox(int idx, int x, int y, int imageIndex)
 {
     Image *image = nullptr;
 
-    if (mImageSet && imageIndex >= 0 && imageIndex < (signed)mImageSet->size())
+    if (mImageSet && imageIndex >= 0 && imageIndex
+        < static_cast<signed>(mImageSet->size()))
+    {
         image = mImageSet->get(imageIndex);
+    }
 
     mBoxes[idx] = new EquipmentBox(x + getPadding(), y + getTitleBarHeight(),
         image);
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index d96aa564f..f33f77e83 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -123,7 +123,7 @@ void ItemPopup::setItem(const Item *item, bool showImage)
         }
         mItemName->adjustSize();
         unsigned minWidth = mItemName->getWidth() + 8;
-        if ((unsigned)getWidth() < minWidth)
+        if (static_cast<unsigned>(getWidth()) < minWidth)
             setWidth(minWidth);
     }
 }
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 357a016f2..e563b8c7c 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/killstats.h"
diff --git a/src/gui/killstats.h b/src/gui/killstats.h
index 9773190de..67c2967e3 100644
--- a/src/gui/killstats.h
+++ b/src/gui/killstats.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef KILLSTATS_H
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 74da37341..b76e71069 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -60,7 +60,7 @@ Minimap::Minimap():
     setDefaultSize(5, 25, 100, 100);
     // set this to false as the minimap window size is changed
     //depending on the map size
-    setResizable(false);
+    setResizable(true);
     setupWindow->registerWindowForReset(this);
 
     setDefaultVisible(true);
@@ -229,13 +229,11 @@ void Minimap::draw(gcn::Graphics *graphics)
             mMapImage->mBounds.h > a.height)
         {
             const Vector &p = player_node->getPosition();
-            mMapOriginX = ((a.width) / 2) - static_cast<int>((p.x
-                + viewport->getCameraRelativeX()) * static_cast<int>(
-                mWidthProportion)) / 32;
+            mMapOriginX = ((a.width) / 2) - (static_cast<float>(p.x
+                + viewport->getCameraRelativeX()) * mWidthProportion) / 32;
 
-            mMapOriginY = ((a.height) / 2) - static_cast<int>((p.y
-                + viewport->getCameraRelativeX()) * static_cast<int>(
-                mHeightProportion)) / 32;
+            mMapOriginY = ((a.height) / 2) - (static_cast<float>(p.y
+                + viewport->getCameraRelativeX()) * mHeightProportion) / 32;
 
             const int minOriginX = a.width - mMapImage->mBounds.w;
             const int minOriginY = a.height - mMapImage->mBounds.h;
@@ -314,9 +312,9 @@ void Minimap::draw(gcn::Graphics *graphics)
         const Vector &pos = being->getPosition();
 
         graphics->fillRectangle(gcn::Rectangle(
-                static_cast<int>(pos.x * mWidthProportion) / 32
+                static_cast<float>(pos.x * mWidthProportion) / 32
                 + mMapOriginX - offsetWidth,
-                static_cast<int>(pos.y * mHeightProportion) / 32
+                static_cast<float>(pos.y * mHeightProportion) / 32
                 + mMapOriginY - offsetHeight,
                 dotSize, dotSize));
     }
@@ -367,10 +365,10 @@ void Minimap::draw(gcn::Graphics *graphics)
     const Vector &pos = player_node->getPosition();
 //    logger->log("width:" + toString(graph->getWidth()));
 
-    int x = static_cast<int>((pos.x - (graph->getWidth() / 2)
+    int x = static_cast<float>((pos.x - (graph->getWidth() / 2)
         + viewport->getCameraRelativeX())
         * mWidthProportion) / 32 + mMapOriginX;
-    int y = static_cast<int>((pos.y - (graph->getHeight() / 2)
+    int y = static_cast<float>((pos.y - (graph->getHeight() / 2)
         + viewport->getCameraRelativeY())
         * mHeightProportion) / 32 + mMapOriginY;
 
@@ -403,17 +401,29 @@ void Minimap::mouseReleased(gcn::MouseEvent &event)
 {
     gcn::Window::mouseReleased(event);
 
-    if (!player_node)
+    if (!player_node || !viewport)
         return;
 
     if (event.getButton() == gcn::MouseEvent::LEFT)
     {
-        const gcn::Rectangle a = getChildrenArea();
-        const int x = event.getX() - a.x;
-        const int y = event.getY() - a.y;
+        int x = event.getX();
+        int y = event.getY();
+        screenToMap(x, y);
 
-        player_node->navigateTo((x - mMapOriginX + mWidthProportion)
-            / mWidthProportion, (y - mMapOriginY + mHeightProportion)
-            / mHeightProportion);
+        player_node->navigateTo(x, y);
     }
+    else if (event.getButton() == gcn::MouseEvent::RIGHT)
+    {
+        int x = event.getX();
+        int y = event.getY();
+        screenToMap(x, y);
+        viewport->showMapPopup(x, y);
+    }
+}
+
+void Minimap::screenToMap(int &x, int &y)
+{
+    const gcn::Rectangle a = getChildrenArea();
+    x = (x - a.x - mMapOriginX + mWidthProportion) / mWidthProportion;
+    y = (y - a.y - mMapOriginY + mHeightProportion) / mHeightProportion;
 }
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 8b7da5849..12835edd5 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -60,6 +60,8 @@ class Minimap : public Window
 
         void mouseReleased(gcn::MouseEvent &event);
 
+        void screenToMap(int &x, int &y);
+
     private:
         Image *mMapImage;
         float mWidthProportion;
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 3e5b30a9c..dd9e79b46 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -78,7 +78,7 @@ NpcDialog::NpcDialog(int npcId) :
     setMinWidth(200);
     setMinHeight(150);
 
-    setDefaultSize(260, 200, ImageRect::CENTER);
+    setDefaultSize(400, 400, ImageRect::CENTER);
 
     mItemLinkHandler = new ItemLinkHandler;
     // Setup output text box
@@ -342,9 +342,20 @@ void NpcDialog::parseListItems(const std::string &itemString)
         mItems.push_back(tmp);
 
     if (!mItems.empty())
+    {
         mItemList->setSelected(0);
+        mItemList->requestFocus();
+    }
     else
+    {
         mItemList->setSelected(-1);
+    }
+}
+
+void NpcDialog::refocus()
+{
+    if (!mItems.empty())
+        mItemList->requestFocus();
 }
 
 void NpcDialog::textRequest(const std::string &defaultText)
@@ -363,7 +374,8 @@ bool NpcDialog::isTextInputFocused() const
 
 bool NpcDialog::isInputFocused() const
 {
-    return mTextField->isFocused() || mIntField->isFocused();
+    return mTextField->isFocused() || mIntField->isFocused()
+        || mItemList->isFocused();
 }
 
 bool NpcDialog::isAnyInputFocused()
diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h
index d4288d5c9..7bd2ee76d 100644
--- a/src/gui/npcdialog.h
+++ b/src/gui/npcdialog.h
@@ -177,6 +177,8 @@ class NpcDialog : public Window, public gcn::ActionListener,
 
         void restoreCamera();
 
+        void refocus();
+
     private:
         typedef std::list<NpcDialog*> DialogList;
         static DialogList instances;
diff --git a/src/gui/okdialog.cpp b/src/gui/okdialog.cpp
index 4a3bdf731..3259cb6d6 100644
--- a/src/gui/okdialog.cpp
+++ b/src/gui/okdialog.cpp
@@ -22,6 +22,8 @@
 
 #include "gui/okdialog.h"
 
+#include "sound.h"
+
 #include "gui/gui.h"
 
 #include "gui/widgets/button.h"
@@ -34,7 +36,8 @@
 #include "debug.h"
 
 OkDialog::OkDialog(const std::string &title, const std::string &msg,
-                   bool modal, bool showCenter, Window *parent):
+                   int soundEvent, bool modal, bool showCenter,
+                   Window *parent):
     Window(title, modal, parent, "ok.xml")
 {
     mTextBox = new TextBox;
@@ -71,6 +74,11 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
         centerHorisontally();
     setVisible(true);
     okButton->requestFocus();
+
+    if (soundEvent == DIALOG_OK)
+        sound.playGuiSound(SOUND_INFO);
+    else if (soundEvent == DIALOG_ERROR)
+        sound.playGuiSound(SOUND_ERROR);
 }
 
 void OkDialog::action(const gcn::ActionEvent &event)
diff --git a/src/gui/okdialog.h b/src/gui/okdialog.h
index 5705be568..b6f17480b 100644
--- a/src/gui/okdialog.h
+++ b/src/gui/okdialog.h
@@ -31,6 +31,13 @@
 
 class TextBox;
 
+enum
+{
+    DIALOG_OK = 0,
+    DIALOG_ERROR,
+    DIALOG_SILENCE
+};
+
 /**
  * An 'Ok' button dialog.
  *
@@ -45,8 +52,8 @@ class OkDialog : public Window, public gcn::ActionListener
          * @see Window::Window
          */
         OkDialog(const std::string &title, const std::string &msg,
-                 bool modal = true, bool showCenter = true,
-                 Window *parent = nullptr);
+                 int soundEvent = DIALOG_OK, bool modal = true,
+                 bool showCenter = true, Window *parent = nullptr);
 
         /**
          * Called when receiving actions from the widgets.
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 73484f1d5..6eaa2ac4e 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -190,7 +190,7 @@ void OutfitWindow::save()
             outfitStr += toString(res);
             if (i < OUTFIT_ITEM_COUNT - 1)
                 outfitStr += " ";
-            outfitColorsStr += toString((int)mItemColors[o][i]);
+            outfitColorsStr += toString(static_cast<int>(mItemColors[o][i]));
             if (i < OUTFIT_ITEM_COUNT - 1)
                 outfitColorsStr += " ";
         }
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index c987843d3..5e5f310dc 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -579,6 +579,25 @@ void PopupMenu::showPopup(int x, int y, MapItem *mapItem)
     showPopup(x, y);
 }
 
+void PopupMenu::showMapPopup(int x, int y, int x2, int y2)
+{
+    mX = x2;
+    mY = y2;
+
+    mBrowserBox->clearRows();
+
+    mBrowserBox->addRow(_("Map Item"));
+
+    if (player_node && player_node->isGM())
+        mBrowserBox->addRow("warp map", _("Warp"));
+    mBrowserBox->addRow("move", _("Move"));
+    mBrowserBox->addRow("movecamera", _("Move camera"));
+    mBrowserBox->addRow("##3---");
+    mBrowserBox->addRow("cancel", _("Cancel"));
+
+    showPopup(x, y);
+}
+
 void PopupMenu::showOutfitsPopup(int x, int y)
 {
     mX = x;
@@ -1161,6 +1180,16 @@ void PopupMenu::handleLink(const std::string &link,
             }
         }
     }
+    else if (link == "move" && (mX || mY))
+    {
+        if (player_node)
+            player_node->navigateTo(mX, mY);
+    }
+    else if (link == "movecamera" && (mX || mY))
+    {
+        if (viewport)
+            viewport->moveCameraToPosition(mX * 32, mY * 32);
+    }
     else if (link == "split" && mItem)
     {
         ItemAmountWindow::showWindow(ItemAmountWindow::ItemSplit,
@@ -1304,6 +1333,14 @@ void PopupMenu::handleLink(const std::string &link,
                 mMapItem->getX(), mMapItem->getY());
         }
     }
+    else if (link == "warp map" && (mX || mY))
+    {
+        if (Game::instance())
+        {
+            Net::getAdminHandler()->warp(Game::instance()->getCurrentMapName(),
+                mX, mY);
+        }
+    }
     else if (link == "remove map" && mMapItem)
     {
         if (viewport)
@@ -2205,7 +2242,7 @@ void PlayerListener::action(const gcn::ActionEvent &event)
     {
         std::string comment = mDialog->getText();
         Being* being  = actorSpriteManager->findBeingByName(
-            mNick, (ActorSprite::Type)mType);
+            mNick, static_cast<ActorSprite::Type>(mType));
         if (being)
             being->setComment(comment);
         Being::saveComment(mNick, comment, mType);
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 8b9107300..f616e46ee 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -142,6 +142,8 @@ class PopupMenu : public Popup, public LinkHandler
 
         void showUndressPopup(int x, int y, Being *being, Item *item);
 
+        void showMapPopup(int x, int y, int x2, int y2);
+
         /**
          * Shows the related popup menu when right click on the chat
          * at the specified mouse coordinates.
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 2122e0d6b..bf0cb299e 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -225,7 +225,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event)
                 mWrongDataNoticeListener->setTarget(this->mPasswordField);
             }
 
-            OkDialog *dlg = new OkDialog(_("Error"), errorMsg);
+            OkDialog *dlg = new OkDialog(_("Error"), errorMsg, DIALOG_ERROR);
             dlg->addActionListener(mWrongDataNoticeListener);
         }
         else
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index b441380a4..f68612793 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -8,6 +8,7 @@
  *
  * Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
  * Copyright (C) 2007-2010  The Mana World Development Team
+ * Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *                                                         Js_./
  * Per Larsson a.k.a finalman                          _RqZ{a<^_aa
@@ -146,7 +147,8 @@ public:
      * only use SDL and plan sticking with SDL you can safely ignore this
      * function as it in the SDL case does nothing.
      */
-    virtual void _pollInput() { }
+    virtual void _pollInput()
+    { }
 
 
     // Inherited from Input
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index ce61f6572..ed9696892 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -125,7 +125,7 @@ std::string ServersListModel::getElementAt(int elementIndex)
 
 void ServersListModel::setVersionString(int index, const std::string &version)
 {
-    if (index >= (int)mVersionStrings.size())
+    if (index >= static_cast<int>(mVersionStrings.size()))
         return;
 
     if (version.empty())
@@ -305,7 +305,7 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
 
     loadServers(true);
 
-    if (mServers.empty())
+    if (needUpdateServers())
         downloadServerList();
 }
 
@@ -484,13 +484,17 @@ void ServerDialog::downloadServerList()
     }
 
     mDownload = new Net::Download(this, listFile, &downloadUpdate);
-    mDownload->setFile(mDir + "/serverlist.xml");
+    mDownload->setFile(mDir + "/" + branding.getStringValue(
+        "onlineServerFile"));
     mDownload->start();
+
+    config.setValue("serverslistupdate", getDateString());
 }
 
 void ServerDialog::loadServers(bool addNew)
 {
-    XML::Document doc(mDir + "/serverlist.xml", false);
+    XML::Document doc(mDir + "/" + branding.getStringValue(
+        "onlineServerFile"), false);
     XmlNodePtr rootNode = doc.rootNode();
 
     if (!rootNode || !xmlNameEqual(rootNode, "serverlist"))
@@ -628,7 +632,7 @@ void ServerDialog::saveCustomServers(const ServerInfo &currentServer,
     // Make sure the current server is mentioned first
     if (currentServer.isValid())
     {
-        if (index >= 0 && (unsigned)index < mServers.size())
+        if (index >= 0 && static_cast<unsigned>(index) < mServers.size())
         {
             mServers[index] = currentServer;
         }
@@ -740,3 +744,14 @@ void ServerDialog::updateServer(ServerInfo server, int index)
 {
     saveCustomServers(server, index);
 }
+
+bool ServerDialog::needUpdateServers()
+{
+    if (mServers.empty() || config.getStringValue("serverslistupdate")
+        != getDateString())
+    {
+        return true;
+    }
+
+    return false;
+}
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index c23fb8776..61620364c 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -138,12 +138,16 @@ class ServerDialog : public Window,
          * Called to load a list of available server from an online xml file.
          */
         void downloadServerList();
+
         void loadServers(bool addNew = true);
 
         void loadCustomServers();
+
         void saveCustomServers(const ServerInfo &currentServer = ServerInfo(),
                                int index = -1);
 
+        bool needUpdateServers();
+
         static int downloadUpdate(void *ptr, DownloadStatus status,
                                   size_t total, size_t remaining);
 
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 3408fba33..c7908a6ac 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -38,6 +38,7 @@
 #include "gui/setup_players.h"
 #include "gui/setup_relations.h"
 #include "gui/setup_video.h"
+#include "gui/setup_visual.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
@@ -92,6 +93,7 @@ Setup::Setup():
     mPanel->enableScrollButtons(true);
 
     mTabs.push_back(new Setup_Video);
+    mTabs.push_back(new Setup_Visual);
     mTabs.push_back(new Setup_Audio);
     mTabs.push_back(new Setup_Perfomance);
     mTabs.push_back(new Setup_Joystick);
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index bc058faf9..69ca4e759 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -23,179 +23,125 @@
 #include "gui/setup_audio.h"
 
 #include "configuration.h"
-#include "logger.h"
 #include "sound.h"
 
-#include "gui/okdialog.h"
+#include "gui/theme.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/checkbox.h"
-#include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
-#include "gui/widgets/slider.h"
+#include "gui/widgets/namesmodel.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/setupitem.h"
 
 #include "utils/gettext.h"
 
 #include "debug.h"
 
-Setup_Audio::Setup_Audio():
-    mMusicVolume(config.getIntValue("musicVolume")),
-    mSfxVolume(config.getIntValue("sfxVolume")),
-    mAudioEnabled(config.getBoolValue("sound")),
-    mGameSoundEnabled(config.getBoolValue("playBattleSound")),
-    mGuiSoundEnabled(config.getBoolValue("playGuiSound")),
-    mMusicEnabled(config.getBoolValue("playMusic")),
-    mMumbleEnabled(config.getBoolValue("enableMumble")),
-    mDownloadEnabled(config.getBoolValue("download-music")),
-    mAudioCheckBox(new CheckBox(_("Enable Audio"), mAudioEnabled)),
-    mGameSoundCheckBox(new CheckBox(_("Enable game sfx"), mGameSoundEnabled)),
-    mGuiSoundCheckBox(new CheckBox(_("Enable gui sfx"), mGuiSoundEnabled)),
-    mMusicCheckBox(new CheckBox(_("Enable music"), mMusicEnabled)),
-    mMumbleCheckBox(new CheckBox(_("Enable mumble voice chat"),
-                    mMumbleEnabled)),
-    mDownloadMusicCheckBox(new CheckBox(_("Download music"),
-                           mDownloadEnabled)),
-    mSfxSlider(new Slider(0, sound.getMaxVolume())),
-    mMusicSlider(new Slider(0, sound.getMaxVolume()))
+class SoundsModel : public NamesModel
+{
+public:
+    SoundsModel()
+    {
+        mNames.push_back(gettext("(no sound)"));
+        Theme::fillSoundsList(mNames);
+    }
+
+    virtual ~SoundsModel()
+    { }
+};
+
+Setup_Audio::Setup_Audio()
 {
     setName(_("Audio"));
-    setDimension(gcn::Rectangle(0, 0, 250, 200));
 
-    gcn::Label *sfxLabel = new Label(_("Sfx volume"));
-    gcn::Label *musicLabel = new Label(_("Music volume"));
+    // Do the layout
+    LayoutHelper h(this);
+    ContainerPlacer place = h.getPlacer(0, 0);
+    place(0, 0, mScroll, 10, 10);
+
+    mSoundModel = new SoundsModel();
 
-    mSfxSlider->setActionEventId("sfx");
-    mMusicSlider->setActionEventId("music");
+    new SetupItemLabel(_("Basic settings"), "", this);
 
-    mSfxSlider->addActionListener(this);
-    mMusicSlider->addActionListener(this);
+    new SetupItemCheckBox(_("Enable Audio"), "", "sound", this, "soundEvent");
 
-    mAudioCheckBox->setPosition(10, 10);
+    new SetupItemCheckBox(_("Enable music"), "",
+        "playMusic", this, "playMusicEvent");
 
-    mSfxSlider->setValue(mSfxVolume);
-    mMusicSlider->setValue(mMusicVolume);
+    new SetupItemCheckBox(_("Enable game sfx"), "",
+        "playBattleSound", this, "playBattleSoundEvent");
 
-    mSfxSlider->setWidth(90);
-    mMusicSlider->setWidth(90);
+    new SetupItemCheckBox(_("Enable gui sfx"), "",
+        "playGuiSound", this, "playGuiSoundEvent");
 
-    // Do the layout
-    LayoutHelper h(this);
-    ContainerPlacer place = h.getPlacer(0, 0);
+    new SetupItemSlider(_("Sfx volume"), "", "sfxVolume",
+        this, "sfxVolumeEvent", 0, sound.getMaxVolume(), 150, true);
+
+    new SetupItemSlider(_("Music volume"), "", "musicVolume",
+        this, "musicVolumeEvent", 0, sound.getMaxVolume(), 150, true);
+
+    new SetupItemLabel(_("Sound effects"), "", this);
+
+    new SetupItemSound(_("Information dialog sound"), "",
+        "soundinfo", this, "soundinfoEvent", mSoundModel);
+
+    new SetupItemSound(_("Request dialog sound"), "",
+        "soundrequest", this, "soundrequestEvent", mSoundModel);
+
+    new SetupItemSound(_("Whisper message sound"), "",
+        "soundwhisper", this, "soundwhisperEvent", mSoundModel);
+
+    new SetupItemSound(_("Guild / Party message sound"), "",
+        "soundguild", this, "soundguildEvent", mSoundModel);
+
+    new SetupItemSound(_("Highlight message sound"), "",
+        "soundhighlight", this, "soundhighlightEvent", mSoundModel);
+
+    new SetupItemSound(_("Global message sound"), "",
+        "soundglobal", this, "soundglobalEvent", mSoundModel);
+
+    new SetupItemSound(_("Error message sound"), "",
+        "sounderror", this, "sounderrorEvent", mSoundModel);
+
+    new SetupItemSound(_("Trade request sound"), "",
+        "soundtrade", this, "soundtradeEvent", mSoundModel);
+
+    new SetupItemLabel(_("Other"), "", this);
+
+    new SetupItemCheckBox(_("Enable mumble voice chat"), "",
+        "enableMumble", this, "enableMumbleEvent");
 
-    place(0, 0, mAudioCheckBox);
-    place(0, 1, mMusicCheckBox);
-    place(0, 2, mGameSoundCheckBox);
-    place(0, 3, mGuiSoundCheckBox);
-    place(0, 4, mSfxSlider);
-    place(1, 4, sfxLabel);
-    place(0, 5, mMusicSlider);
-    place(1, 5, musicLabel);
-    place(0, 6, mMumbleCheckBox);
-    place(0, 7, mDownloadMusicCheckBox);
-
-    setDimension(gcn::Rectangle(0, 0, 365, 280));
+    new SetupItemCheckBox(_("Download music"), "",
+        "download-music", this, "download-musicEvent");
+
+    setDimension(gcn::Rectangle(0, 0, 550, 350));
 }
 
-void Setup_Audio::apply()
+Setup_Audio::~Setup_Audio()
 {
-    mAudioEnabled = mAudioCheckBox->isSelected();
-    mGameSoundEnabled = mGameSoundCheckBox->isSelected();
-    mGuiSoundEnabled = mGuiSoundCheckBox->isSelected();
-    mMusicEnabled = mMusicCheckBox->isSelected();
-    mMumbleEnabled = mMumbleCheckBox->isSelected();
-    mDownloadEnabled = mDownloadMusicCheckBox->isSelected();
-    mSfxVolume = config.getIntValue("sfxVolume");
-    mMusicVolume = config.getIntValue("musicVolume");
-
-    config.setValue("sound", mAudioEnabled);
-    config.setValue("playBattleSound", mGameSoundEnabled);
-    config.setValue("playGuiSound", mGuiSoundEnabled);
-
-    config.setValue("enableMumble", mMumbleEnabled);
-
-    // Display a message if user has selected to download music,
-    // And if downloadmusic is not already enabled
-    if (mDownloadEnabled && !config.getBoolValue("download-music"))
-    {
-        new OkDialog(_("Notice"), _("You may have to restart your client "
-                     "if you want to download new music"));
-    }
-    config.setValue("download-music", mDownloadEnabled);
+    delete mSoundModel;
+    mSoundModel = nullptr;
+}
 
-    if (mAudioEnabled)
+void Setup_Audio::apply()
+{
+    SetupTabScroll::apply();
+    if (config.getBoolValue("sound"))
     {
-        try
-        {
-            sound.init();
-        }
-        catch (const char *err)
+        sound.init();
+        if (viewport && config.getBoolValue("playMusic"))
         {
-            new OkDialog(_("Sound Engine"), err);
-            logger->log("Warning: %s", err);
+            Map *map = viewport->getMap();
+            if (map)
+                sound.playMusic(map->getMusicFile());
         }
-        if (mMusicEnabled)
-        {
-            if (viewport && !config.getBoolValue("playMusic"))
-            {
-                Map *map = viewport->getMap();
-                if (map)
-                {
-                    config.setValue("playMusic", mMusicEnabled);
-                    sound.playMusic(map->getMusicFile());
-                }
-            }
-        }
-        else if (config.getBoolValue("playMusic"))
+        else
         {
             sound.stopMusic();
         }
-
     }
     else
     {
         sound.close();
     }
-
-    config.setValue("playMusic", mMusicEnabled);
-}
-
-void Setup_Audio::cancel()
-{
-    mAudioCheckBox->setSelected(mAudioEnabled);
-    mGameSoundCheckBox->setSelected(mGameSoundEnabled);
-    mGuiSoundCheckBox->setSelected(mGuiSoundEnabled);
-    mMusicCheckBox->setSelected(mMusicEnabled);
-    mMumbleCheckBox->setSelected(mMumbleEnabled);
-    mDownloadMusicCheckBox->setSelected(mDownloadEnabled);
-
-    sound.setSfxVolume(mSfxVolume);
-    mSfxSlider->setValue(mSfxVolume);
-
-    sound.setMusicVolume(mMusicVolume);
-    mMusicSlider->setValue(mMusicVolume);
-
-    config.setValue("sound", mAudioEnabled);
-    config.setValue("playBattleSound", mGameSoundEnabled);
-    config.setValue("playGuiSound", mGuiSoundEnabled);
-    config.setValue("enableMumble", mMumbleEnabled);
-    config.setValue("download-music", mDownloadEnabled);
-    config.setValue("sfxVolume", mSfxVolume);
-    config.setValue("musicVolume", mMusicVolume);
-    config.setValue("playMusic", mMusicEnabled);
-}
-
-void Setup_Audio::action(const gcn::ActionEvent &event)
-{
-    if (event.getId() == "sfx")
-    {
-        config.setValueInt("sfxVolume",
-            static_cast<int>(mSfxSlider->getValue()));
-        sound.setSfxVolume(static_cast<int>(mSfxSlider->getValue()));
-    }
-    else if (event.getId() == "music")
-    {
-        config.setValueInt("musicVolume",
-            static_cast<int>(mMusicSlider->getValue()));
-        sound.setMusicVolume(static_cast<int>(mMusicSlider->getValue()));
-    }
 }
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index 88869d730..21b661bcb 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -25,30 +25,21 @@
 
 #include "guichanfwd.h"
 
-#include "gui/widgets/setuptab.h"
+#include "gui/widgets/setuptabscroll.h"
 
 #include <guichan/actionlistener.hpp>
 
-class Setup_Audio : public SetupTab
+class Setup_Audio : public SetupTabScroll
 {
     public:
         Setup_Audio();
 
-        void apply();
-        void cancel();
+        ~Setup_Audio();
 
-        void action(const gcn::ActionEvent &event);
+        void apply();
 
     private:
-        int mMusicVolume, mSfxVolume;
-        bool mAudioEnabled, mGameSoundEnabled, mGuiSoundEnabled;
-        bool mMusicEnabled, mMumbleEnabled;
-        bool mDownloadEnabled;
-
-        gcn::CheckBox *mAudioCheckBox, *mGameSoundCheckBox, *mGuiSoundCheckBox;
-        gcn::CheckBox *mMusicCheckBox, *mMumbleCheckBox;
-        gcn::CheckBox *mDownloadMusicCheckBox;
-        gcn::Slider *mSfxSlider, *mMusicSlider;
+        gcn::ListModel *mSoundModel;
 };
 
 #endif
diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp
index 7e81acaa9..4bfb8928e 100644
--- a/src/gui/setup_chat.cpp
+++ b/src/gui/setup_chat.cpp
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/setup_chat.h"
diff --git a/src/gui/setup_chat.h b/src/gui/setup_chat.h
index 238021cca..858dadf3a 100644
--- a/src/gui/setup_chat.h
+++ b/src/gui/setup_chat.h
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GUI_SETUP_CHAT_H
diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp
index 290607be4..cb3ff9341 100644
--- a/src/gui/setup_joystick.cpp
+++ b/src/gui/setup_joystick.cpp
@@ -31,6 +31,7 @@
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
+#include "gui/widgets/namesmodel.h"
 
 #include "utils/gettext.h"
 
@@ -40,32 +41,6 @@
 
 extern Joystick *joystick;
 
-class NamesModel : public gcn::ListModel
-{
-    public:
-        NamesModel()
-        { }
-
-        virtual ~NamesModel()
-        { }
-
-        virtual int getNumberOfElements()
-        {
-            return static_cast<int>(mNames.size());
-        }
-
-        virtual std::string getElementAt(int i)
-        {
-            if (i >= getNumberOfElements() || i < 0)
-                return _("???");
-
-            return mNames[i];
-        }
-
-        std::vector<std::string> mNames;
-};
-
-
 Setup_Joystick::Setup_Joystick():
     mCalibrateLabel(new Label(_("Press the button to start calibration"))),
     mCalibrateButton(new Button(_("Calibrate"), "calibrate", this)),
@@ -77,7 +52,7 @@ Setup_Joystick::Setup_Joystick():
 {
     setName(_("Joystick"));
 
-    Joystick::getNames(mNamesModel->mNames);
+    Joystick::getNames(mNamesModel->getNames());
 
     mOriginalJoystickEnabled = config.getBoolValue("joystickEnabled");
     mJoystickEnabled->setSelected(mOriginalJoystickEnabled);
@@ -95,7 +70,7 @@ Setup_Joystick::Setup_Joystick():
     else
     {
         unsigned sel = config.getIntValue("selectedJoystick");
-        if (sel >= mNamesModel->mNames.size())
+        if (sel >= mNamesModel->size())
             sel = 0;
         mNamesDropDown->setSelected(sel);
     }
@@ -146,7 +121,7 @@ void Setup_Joystick::action(const gcn::ActionEvent &event)
         {
             mCalibrateButton->setCaption(_("Stop"));
             mCalibrateLabel->setCaption(
-                _("Rotate the stick and dont press buttons"));
+                _("Rotate the stick and don't press buttons"));
             joystick->startCalibration();
         }
     }
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index bdd7c2083..ef024c5d9 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -131,7 +131,7 @@ void Setup_Keyboard::apply()
     if (keyboard.hasConflicts())
     {
         new OkDialog(_("Key Conflict(s) Detected."),
-                     keyboard.getBindError());
+            keyboard.getBindError(), DIALOG_ERROR);
     }
     keyboard.setEnabled(true);
     keyboard.store();
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index bffa13cf6..5970a7735 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -1,6 +1,9 @@
 /*
  *  Custom keyboard shortcuts configuration
  *  Copyright (C) 2007  Joshua Langley <joshlangley@optusnet.com.au>
+ *  Copyright (C) 2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp
index d6f5e9972..3ea5f4e4a 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/setup_other.cpp
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/setup_other.h"
diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h
index 4144a02ab..182a3f4c6 100644
--- a/src/gui/setup_other.h
+++ b/src/gui/setup_other.h
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GUI_Setup_Other_H
diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp
index 95703fa4c..976f1123b 100644
--- a/src/gui/setup_perfomance.cpp
+++ b/src/gui/setup_perfomance.cpp
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/setup_perfomance.h"
diff --git a/src/gui/setup_perfomance.h b/src/gui/setup_perfomance.h
index 097c1e28c..178cf3265 100644
--- a/src/gui/setup_perfomance.h
+++ b/src/gui/setup_perfomance.h
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GUI_SETUP_PERFOMANCE_H
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index a08517fae..b2cd7847d 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/setup_players.h"
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index ebfc78db6..8db486eb0 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GUI_SETUP_PLAYERS_H
diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp
index 47d53620c..d9f7a362d 100644
--- a/src/gui/setup_relations.cpp
+++ b/src/gui/setup_relations.cpp
@@ -80,7 +80,8 @@ static const char *RELATION_NAMES[PlayerRelation::RELATIONS_NR] =
 class PlayerRelationListModel : public gcn::ListModel
 {
 public:
-    virtual ~PlayerRelationListModel() { }
+    virtual ~PlayerRelationListModel()
+    { }
 
     virtual int getNumberOfElements()
     {
@@ -194,7 +195,7 @@ public:
 
     std::string getPlayerAt(int index) const
     {
-        if (index < 0 || index >= (signed)mPlayers->size())
+        if (index < 0 || index >= static_cast<signed>(mPlayers->size()))
             return "";
         return (*mPlayers)[index];
     }
@@ -211,7 +212,8 @@ protected:
 class IgnoreChoicesListModel : public gcn::ListModel
 {
 public:
-    virtual ~IgnoreChoicesListModel() { }
+    virtual ~IgnoreChoicesListModel()
+    { }
 
     virtual int getNumberOfElements()
     {
diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp
index 67936f698..7386f496a 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/setup_theme.cpp
@@ -1,8 +1,8 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
- *  Copyright (C) 2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/setup_theme.h"
@@ -30,10 +29,11 @@
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
+#include "gui/widgets/dropdown.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
+#include "gui/widgets/namesmodel.h"
 #include "gui/widgets/textfield.h"
-#include "gui/widgets/dropdown.h"
 
 #include "configuration.h"
 #include "localplayer.h"
@@ -54,32 +54,6 @@ const char* ACTION_HELP_FONT = "help font";
 const char* ACTION_SECURE_FONT = "secure font";
 const char* ACTION_JAPAN_FONT = "japan font";
 
-class NamesModel : public gcn::ListModel
-{
-public:
-    NamesModel()
-    {
-    }
-
-    virtual ~NamesModel() { }
-
-    virtual int getNumberOfElements()
-    {
-        return static_cast<int>(mNames.size());
-    }
-
-    virtual std::string getElementAt(int i)
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return _("???");
-
-        return mNames[i];
-    }
-
-protected:
-    std::vector<std::string> mNames;
-};
-
 class ThemesModel : public NamesModel
 {
 public:
@@ -375,8 +349,8 @@ void Setup_Theme::apply()
     if (config.getValue("theme",
         config.getValue("selectedSkin", "")) != mTheme)
     {
-        new OkDialog(_("Theme Changed"),
-                     _("Restart your client for the change to take effect."));
+        new OkDialog(_("Theme Changed"), _("Restart your client for "
+            "the change to take effect."));
     }
 
     config.setValue("selectedSkin", "");
diff --git a/src/gui/setup_theme.h b/src/gui/setup_theme.h
index 1ff159195..496ba2aca 100644
--- a/src/gui/setup_theme.h
+++ b/src/gui/setup_theme.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GUI_Setup_Theme_H
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 6b3d6d4d3..24d42c83d 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -28,7 +28,6 @@
 #include "localplayer.h"
 #include "logger.h"
 #include "main.h"
-#include "particle.h"
 
 #include "gui/gui.h"
 #include "gui/okdialog.h"
@@ -40,6 +39,7 @@
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/slider.h"
+#include "gui/widgets/sliderlist.h"
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/dropdown.h"
 
@@ -214,106 +214,26 @@ public:
     }
 };
 
-static const char *speechModeToString(Being::Speech mode)
-{
-    switch (mode)
-    {
-        case Being::NO_SPEECH:
-        default:
-            return _("No text");
-        case Being::TEXT_OVERHEAD:
-            return _("Text");
-        case Being::NO_NAME_IN_BUBBLE:
-            return _("Bubbles, no names");
-        case Being::NAME_IN_BUBBLE:
-            return _("Bubbles with names");
-    }
-    return "";
-}
-
-const char *Setup_Video::overlayDetailToString(int detail)
-{
-    if (detail == -1)
-        detail = config.getIntValue("OverlayDetail");
-
-    switch (detail)
-    {
-        case 0:
-            return _("off");
-        case 1:
-            return _("low");
-        case 2:
-            return _("high");
-        default:
-            return "";
-    }
-    return "";
-}
-
-const char *Setup_Video::particleDetailToString(int detail)
-{
-    if (detail == -1)
-        detail = 3 - config.getIntValue("particleEmitterSkip");
-
-    switch (detail)
-    {
-        case 0:
-            return _("low");
-        case 1:
-            return _("medium");
-        case 2:
-            return _("high");
-        case 3:
-            return _("max");
-        default:
-            return "";
-    }
-    return "";
-}
-
 Setup_Video::Setup_Video():
     mFullScreenEnabled(config.getBoolValue("screen")),
     mOpenGLEnabled(config.getIntValue("opengl")),
     mCustomCursorEnabled(config.getBoolValue("customcursor")),
-    mParticleEffectsEnabled(config.getBoolValue("particleeffects")),
-    mPickupChatEnabled(config.getBoolValue("showpickupchat")),
-    mPickupParticleEnabled(config.getBoolValue("showpickupparticle")),
-    mOpacity(config.getFloatValue("guialpha")),
     mFps(config.getIntValue("fpslimit")),
     mAltFps(config.getIntValue("altfpslimit")),
     mEnableResize(config.getBoolValue("enableresize")),
     mNoFrame(config.getBoolValue("noframe")),
-    mSpeechMode(static_cast<Being::Speech>(
-        config.getIntValue("speech"))),
     mModeListModel(new ModeListModel),
     mModeList(new ListBox(mModeListModel)),
     mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)),
     mCustomCursorCheckBox(new CheckBox(_("Custom cursor"),
                           mCustomCursorEnabled)),
-    mParticleEffectsCheckBox(new CheckBox(_("Particle effects"),
-                             mParticleEffectsEnabled)),
-    mPickupNotifyLabel(new Label(_("Show pickup notification"))),
-    // TRANSLATORS: Refers to "Show own name"
-    mPickupChatCheckBox(new CheckBox(_("in chat"), mPickupChatEnabled)),
-    // TRANSLATORS: Refers to "Show own name"
-    mPickupParticleCheckBox(new CheckBox(_("as particle"),
-                            mPickupParticleEnabled)),
     mEnableResizeCheckBox(new CheckBox(_("Enable resize"), mEnableResize)),
     mNoFrameCheckBox(new CheckBox(_("No frame"), mNoFrame)),
-    mSpeechSlider(new Slider(0, 3)),
-    mSpeechLabel(new Label("")),
-    mAlphaSlider(new Slider(0.1, 1.0)),
     mFpsCheckBox(new CheckBox(_("FPS limit:"))),
     mFpsSlider(new Slider(2, 160)),
     mFpsLabel(new Label),
     mAltFpsSlider(new Slider(2, 160)),
     mAltFpsLabel(new Label(_("Alt FPS limit: "))),
-    mOverlayDetail(config.getIntValue("OverlayDetail")),
-    mOverlayDetailSlider(new Slider(0, 2)),
-    mOverlayDetailField(new Label),
-    mParticleDetail(3 - config.getIntValue("particleEmitterSkip")),
-    mParticleDetailSlider(new Slider(0, 3)),
-    mParticleDetailField(new Label),
     mDialog(nullptr)
 {
     setName(_("Video"));
@@ -322,11 +242,6 @@ Setup_Video::Setup_Video():
     scrollArea->setWidth(150);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
 
-    speechLabel = new Label(_("Overhead text"));
-    alphaLabel = new Label(_("Gui opacity"));
-    overlayDetailLabel = new Label(_("Ambient FX"));
-    particleDetailLabel = new Label(_("Particle detail"));
-
     mOpenGLListModel = new OpenGLListModel;
     mOpenGLDropDown = new DropDown(mOpenGLListModel),
     mOpenGLDropDown->setSelected(mOpenGLEnabled);
@@ -337,9 +252,6 @@ Setup_Video::Setup_Video():
     mOpenGLDropDown->setSelected(0);
 #endif
 
-    mAlphaSlider->setValue(mOpacity);
-    mAlphaSlider->setWidth(90);
-
     mFpsLabel->setCaption(mFps > 0 ? toString(mFps) : _("None"));
     mFpsLabel->setWidth(60);
     mAltFpsLabel->setCaption(_("Alt FPS limit: ") + (mAltFps > 0
@@ -358,57 +270,28 @@ Setup_Video::Setup_Video():
 
     mModeList->setActionEventId("videomode");
     mCustomCursorCheckBox->setActionEventId("customcursor");
-    mParticleEffectsCheckBox->setActionEventId("particleeffects");
-    mPickupChatCheckBox->setActionEventId("pickupchat");
-    mPickupParticleCheckBox->setActionEventId("pickupparticle");
-    mAlphaSlider->setActionEventId("guialpha");
     mFpsCheckBox->setActionEventId("fpslimitcheckbox");
-    mSpeechSlider->setActionEventId("speech");
     mFpsSlider->setActionEventId("fpslimitslider");
     mAltFpsSlider->setActionEventId("altfpslimitslider");
-    mOverlayDetailSlider->setActionEventId("overlaydetailslider");
-    mOverlayDetailField->setActionEventId("overlaydetailfield");
-    mParticleDetailSlider->setActionEventId("particledetailslider");
-    mParticleDetailField->setActionEventId("particledetailfield");
     mOpenGLDropDown->setActionEventId("opengl");
     mEnableResizeCheckBox->setActionEventId("enableresize");
     mNoFrameCheckBox->setActionEventId("noframe");
 
     mModeList->addActionListener(this);
     mCustomCursorCheckBox->addActionListener(this);
-    mParticleEffectsCheckBox->addActionListener(this);
-    mPickupChatCheckBox->addActionListener(this);
-    mPickupParticleCheckBox->addActionListener(this);
-    mAlphaSlider->addActionListener(this);
     mFpsCheckBox->addActionListener(this);
-    mSpeechSlider->addActionListener(this);
     mFpsSlider->addActionListener(this);
     mAltFpsSlider->addActionListener(this);
-    mOverlayDetailSlider->addActionListener(this);
-    mOverlayDetailField->addKeyListener(this);
-    mParticleDetailSlider->addActionListener(this);
-    mParticleDetailField->addKeyListener(this);
     mOpenGLDropDown->addActionListener(this);
     mEnableResizeCheckBox->addActionListener(this);
     mNoFrameCheckBox->addActionListener(this);
 
-    mSpeechLabel->setCaption(speechModeToString(mSpeechMode));
-    mSpeechSlider->setValue(mSpeechMode);
-
-    mOverlayDetailField->setCaption(overlayDetailToString(mOverlayDetail));
-    mOverlayDetailSlider->setValue(mOverlayDetail);
-
-    mParticleDetailField->setCaption(particleDetailToString(mParticleDetail));
-    mParticleDetailSlider->setValue(mParticleDetail);
-
     // Do the layout
     LayoutHelper h(this);
     ContainerPlacer place = h.getPlacer(0, 0);
 
-    place(0, 0, scrollArea, 1, 6).setPadding(2);
-    place(0, 6, mOpenGLDropDown, 1);
-
-//    place(0, 6, mHwAccelCheckBox, 6);
+    place(0, 0, scrollArea, 1, 5).setPadding(2);
+    place(0, 5, mOpenGLDropDown, 1);
 
     place(1, 0, mFsCheckBox, 2);
 
@@ -417,33 +300,34 @@ Setup_Video::Setup_Video():
     place(1, 2, mEnableResizeCheckBox, 2);
     place(1, 3, mNoFrameCheckBox, 2);
 
-    place(1, 4, mParticleEffectsCheckBox, 2);
 
-    place(1, 5, mPickupNotifyLabel, 4);
-    place(1, 6, mPickupChatCheckBox, 1);
-    place(2, 6, mPickupParticleCheckBox, 2);
+//    place(1, 5, mPickupNotifyLabel, 4);
+//    place(1, 6, mPickupChatCheckBox, 1);
+//    place(2, 6, mPickupParticleCheckBox, 2);
 
-    place(0, 7, mAlphaSlider);
-    place(1, 7, alphaLabel, 3);
+//    place(0, 7, mAlphaSlider);
+//    place(1, 7, alphaLabel, 3);
 
-    place(0, 9, mFpsSlider);
-    place(1, 9, mFpsCheckBox).setPadding(3);
-    place(2, 9, mFpsLabel).setPadding(1);
+    place(0, 6, mFpsSlider);
+    place(1, 6, mFpsCheckBox).setPadding(3);
+    place(2, 6, mFpsLabel).setPadding(1);
 
-    place(0, 10, mAltFpsSlider);
-    place(1, 10, mAltFpsLabel).setPadding(3);
+    place(0, 7, mAltFpsSlider);
+    place(1, 7, mAltFpsLabel).setPadding(3);
 
-    place(0, 11, mSpeechSlider);
-    place(1, 11, speechLabel);
-    place(2, 11, mSpeechLabel, 3).setPadding(2);
+//    place(0, 11, mSpeechSlider);
+//    place(1, 11, speechLabel);
+//    place(2, 11, mSpeechLabel, 3).setPadding(2);
 
-    place(0, 12, mOverlayDetailSlider);
-    place(1, 12, overlayDetailLabel);
-    place(2, 12, mOverlayDetailField, 3).setPadding(2);
+//    place(0, 12, mOverlayDetailSlider);
+//    place(1, 12, overlayDetailLabel);
+//    place(2, 12, mOverlayDetailField, 3).setPadding(2);
 
-    place(0, 13, mParticleDetailSlider);
-    place(1, 13, particleDetailLabel);
-    place(2, 13, mParticleDetailField, 3).setPadding(2);
+//    place(0, 13, mParticleEffectsCheckBox, 5);
+
+//    place(0, 14, mParticleDetailSlider);
+//    place(1, 14, particleDetailLabel);
+//    place(2, 14, mParticleDetailField, 3).setPadding(2);
 
     int width = 600;
 
@@ -501,7 +385,7 @@ void Setup_Video::apply()
                             " and restoration of old mode also "
                             "failed!") << std::endl;
                     }
-                    logger->error(errorMsg.str());
+                    logger->safeError(errorMsg.str());
                 }
             }
 #if defined(WIN32) || defined(__APPLE__)
@@ -509,7 +393,7 @@ void Setup_Video::apply()
         else
         {
             new OkDialog(_("Switching to Full Screen"),
-                         _("Restart needed for changes to take effect."));
+                _("Restart needed for changes to take effect."));
         }
 #endif
         config.setValue("screen", fullscreen);
@@ -522,7 +406,7 @@ void Setup_Video::apply()
 
         // OpenGL can currently only be changed by restarting, notify user.
         new OkDialog(_("Changing to OpenGL"),
-                     _("Applying change to OpenGL requires restart."));
+            _("Applying change to OpenGL requires restart."));
     }
 
     mFps = mFpsCheckBox->isSelected() ?
@@ -541,15 +425,8 @@ void Setup_Video::apply()
     // We sync old and new values at apply time
     mFullScreenEnabled = config.getBoolValue("screen");
     mCustomCursorEnabled = config.getBoolValue("customcursor");
-    mParticleEffectsEnabled = config.getBoolValue("particleeffects");
 
-    mSpeechMode = static_cast<Being::Speech>(
-        config.getIntValue("speech"));
-    mOpacity = config.getFloatValue("guialpha");
-    mOverlayDetail = config.getIntValue("OverlayDetail");
     mOpenGLEnabled = config.getIntValue("opengl");
-    mPickupChatEnabled = config.getBoolValue("showpickupchat");
-    mPickupParticleEnabled = config.getBoolValue("showpickupparticle");
     mEnableResize = config.getBoolValue("enableresize");
     mNoFrame = config.getBoolValue("noframe");
 }
@@ -560,15 +437,10 @@ void Setup_Video::cancel()
     mFsCheckBox->setSelected(mFullScreenEnabled);
     mOpenGLDropDown->setSelected(mOpenGLEnabled);
     mCustomCursorCheckBox->setSelected(mCustomCursorEnabled);
-    mParticleEffectsCheckBox->setSelected(mParticleEffectsEnabled);
     mFpsSlider->setValue(mFps);
     mFpsSlider->setEnabled(mFps > 0);
     mAltFpsSlider->setValue(mAltFps);
     mAltFpsSlider->setEnabled(mAltFps > 0);
-    mSpeechSlider->setValue(mSpeechMode);
-    mAlphaSlider->setValue(mOpacity);
-    mOverlayDetailSlider->setValue(mOverlayDetail);
-    mParticleDetailSlider->setValue(mParticleDetail);
     mFpsLabel->setCaption(mFpsCheckBox->isSelected()
                           ? toString(mFps) : _("None"));
     mAltFpsLabel->setCaption(_("Alt FPS limit: ") + toString(mAltFps));
@@ -585,13 +457,7 @@ void Setup_Video::cancel()
     config.setValue("screenheight", mainGraphics->mHeight);
 
     config.setValue("customcursor", mCustomCursorEnabled);
-    config.setValue("particleeffects", mParticleEffectsEnabled);
-    config.setValue("speech", static_cast<int>(mSpeechMode));
-    config.setValue("guialpha", mOpacity);
-    Image::setEnableAlpha(mOpacity != 1.0f);
     config.setValue("opengl", mOpenGLEnabled);
-    config.setValue("showpickupchat", mPickupChatEnabled);
-    config.setValue("showpickupparticle", mPickupParticleEnabled);
     config.setValue("enableresize", mEnableResize);
     config.setValue("noframe", mNoFrame);
 }
@@ -632,13 +498,17 @@ void Setup_Video::action(const gcn::ActionEvent &event)
         {
 #if defined(_WIN32)
             if (width < mainGraphics->mWidth || height < mainGraphics->mHeight)
+            {
                 new OkDialog(_("Screen Resolution Changed"),
-                       _("Restart your client for the change to take effect.")
-                       + std::string("\n") +
-                _("Some windows may be moved to fit the lowered resolution."));
+                   _("Restart your client for the change to take effect.")
+                   + std::string("\n") + _("Some windows may be moved to "
+                    "fit the lowered resolution."));
+            }
             else
+            {
                 new OkDialog(_("Screen Resolution Changed"),
-                     _("Restart your client for the change to take effect."));
+                    _("Restart your client for the change to take effect."));
+            }
 #else
             Client::resize(width, height);
 #endif
@@ -654,57 +524,10 @@ void Setup_Video::action(const gcn::ActionEvent &event)
     {
         mDialog = nullptr;
     }
-    else if (id == "guialpha")
-    {
-        config.setValue("guialpha", mAlphaSlider->getValue());
-        Image::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f);
-    }
     else if (id == "customcursor")
     {
         config.setValue("customcursor", mCustomCursorCheckBox->isSelected());
     }
-    else if (id == "particleeffects")
-    {
-        config.setValue("particleeffects",
-                        mParticleEffectsCheckBox->isSelected());
-        Particle::enabled = mParticleEffectsCheckBox->isSelected();
-
-        if (Game::instance())
-        {
-            new OkDialog(_("Particle Effect Settings Changed."),
-                         _("Changes will take effect on map change."));
-        }
-    }
-    else if (id == "pickupchat")
-    {
-        config.setValue("showpickupchat", mPickupChatCheckBox->isSelected());
-    }
-    else if (id == "pickupparticle")
-    {
-        config.setValue("showpickupparticle",
-                        mPickupParticleCheckBox->isSelected());
-    }
-    else if (id == "speech")
-    {
-        Being::Speech val = static_cast<Being::Speech>(
-            mSpeechSlider->getValue());
-        mSpeechLabel->setCaption(speechModeToString(val));
-        mSpeechSlider->setValue(val);
-        config.setValue("speech", static_cast<int>(val));
-    }
-    else if (id == "overlaydetailslider")
-    {
-        int val = static_cast<int>(mOverlayDetailSlider->getValue());
-        mOverlayDetailField->setCaption(overlayDetailToString(val));
-        config.setValue("OverlayDetail", val);
-    }
-    else if (id == "particledetailslider")
-    {
-        int val = static_cast<int>(mParticleDetailSlider->getValue());
-        mParticleDetailField->setCaption(particleDetailToString(val));
-        config.setValue("particleEmitterSkip", 3 - val);
-        Particle::emitterSkip = 4 - val;
-    }
     else if (id == "fpslimitcheckbox" || id == "fpslimitslider")
     {
         int tempFps = static_cast<int>(mFpsSlider->getValue());
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 31d45d93d..0e7bc0f21 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -46,68 +46,38 @@ class Setup_Video : public SetupTab, public gcn::KeyListener
 
         void action(const gcn::ActionEvent &event);
 
-        static const char *overlayDetailToString(int detail = -1);
-
-        static const char *particleDetailToString(int detail = -1);
-
         virtual void externalUpdated();
 
     private:
         bool mFullScreenEnabled;
         int mOpenGLEnabled;
         bool mCustomCursorEnabled;
-        bool mParticleEffectsEnabled;
-        bool mPickupChatEnabled;
-        bool mPickupParticleEnabled;
-        float mOpacity;
         int mFps;
         int mAltFps;
         bool mEnableResize;
         bool mNoFrame;
-        Being::Speech mSpeechMode;
 
         ModeListModel *mModeListModel;
 
         OpenGLListModel *mOpenGLListModel;
 
-        gcn::Label *speechLabel;
-        gcn::Label *alphaLabel;
         gcn::Label *scrollRadiusLabel;
         gcn::Label *scrollLazinessLabel;
-        gcn::Label *overlayDetailLabel;
-        gcn::Label *particleDetailLabel;
 
         gcn::ListBox *mModeList;
         gcn::CheckBox *mFsCheckBox;
         gcn::DropDown *mOpenGLDropDown;
         gcn::CheckBox *mCustomCursorCheckBox;
-        gcn::CheckBox *mParticleEffectsCheckBox;
-
-        gcn::Label *mPickupNotifyLabel;
-        gcn::CheckBox *mPickupChatCheckBox;
-        gcn::CheckBox *mPickupParticleCheckBox;
 
         gcn::CheckBox *mEnableResizeCheckBox;
         gcn::CheckBox *mNoFrameCheckBox;
 
-        gcn::Slider *mSpeechSlider;
-        gcn::Label *mSpeechLabel;
-        gcn::Slider *mAlphaSlider;
         gcn::CheckBox *mFpsCheckBox;
         gcn::Slider *mFpsSlider;
         gcn::Label *mFpsLabel;
-//        gcn::CheckBox *mAltFpsCheckBox;
         gcn::Slider *mAltFpsSlider;
         gcn::Label *mAltFpsLabel;
 
-        int mOverlayDetail;
-        gcn::Slider *mOverlayDetailSlider;
-        gcn::Label *mOverlayDetailField;
-
-        int mParticleDetail;
-        gcn::Slider *mParticleDetailSlider;
-        gcn::Label *mParticleDetailField;
-
         TextDialog *mDialog;
 };
 
diff --git a/src/gui/setup_visual.cpp b/src/gui/setup_visual.cpp
new file mode 100644
index 000000000..55e219bd7
--- /dev/null
+++ b/src/gui/setup_visual.cpp
@@ -0,0 +1,112 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "gui/setup_visual.h"
+
+#include "gui/widgets/layouthelper.h"
+#include "gui/widgets/scrollarea.h"
+
+#include "client.h"
+
+#include "utils/gettext.h"
+
+#include "debug.h"
+
+Setup_Visual::Setup_Visual()
+{
+    setName(_("Visual"));
+    // Do the layout
+    LayoutHelper h(this);
+    ContainerPlacer place = h.getPlacer(0, 0);
+    place(0, 0, mScroll, 10, 10);
+
+    mPreferredFirstItemSize = 150;
+
+    new SetupItemCheckBox(_("Show pickup notifications in chat"), "",
+        "showpickupchat", this, "showpickupchatEvent");
+
+    new SetupItemCheckBox(_("Show pickup notifications as particle effects"),
+        "", "showpickupparticle", this, "showpickupparticleEvent");
+
+    new SetupItemCheckBox(_("Grab mouse and keyboard input"),
+        "", "grabinput", this, "grabinputEvent");
+
+    new SetupItemSlider(_("Gui opacity"), "", "guialpha",
+        this, "guialphaEvent", 0.1, 1.0, 150, true);
+
+    mSpeachList = new SetupItemNames();
+    mSpeachList->push_back(_("No text"));
+    mSpeachList->push_back(_("Text"));
+    mSpeachList->push_back(_("Bubbles, no names"));
+    mSpeachList->push_back(_("Bubbles with names"));
+    new SetupItemSlider2(_("Overhead text"), "", "speech", this,
+        "speechEvent", 0, 3, mSpeachList);
+
+    mAmbientFxList = new SetupItemNames();
+    mAmbientFxList->push_back(_("off"));
+    mAmbientFxList->push_back(_("low"));
+    mAmbientFxList->push_back(_("high"));
+    new SetupItemSlider2(_("Ambient FX"), "", "OverlayDetail", this,
+        "OverlayDetailEvent", 0, 2, mAmbientFxList);
+
+    new SetupItemCheckBox(_("Particle effects"), "",
+        "particleeffects", this, "particleeffectsEvent");
+
+    mParticleList = new SetupItemNames();
+    mParticleList->push_back(_("low"));
+    mParticleList->push_back(_("medium"));
+    mParticleList->push_back(_("high"));
+    mParticleList->push_back(_("max"));
+    (new SetupItemSlider2(_("Particle detail"), "", "particleEmitterSkip",
+        this, "particleEmitterSkipEvent", 0, 3,
+        mParticleList, true))->setInvertValue(3);
+
+    new SetupItemSlider(_("Gamma"), "", "gamma",
+        this, "gammeEvent", 1, 20, 350, true);
+
+    mVSyncList = new SetupItemNames();
+    mVSyncList->push_back(_("default"));
+    mVSyncList->push_back(_("off"));
+    mVSyncList->push_back(_("on"));
+    new SetupItemSlider2(_("Vsync"), "", "vsync", this,
+        "vsyncEvent", 0, 2, mVSyncList);
+
+    setDimension(gcn::Rectangle(0, 0, 550, 350));
+}
+
+Setup_Visual::~Setup_Visual()
+{
+    delete mSpeachList;
+    mSpeachList = nullptr;
+    delete mAmbientFxList;
+    mAmbientFxList = nullptr;
+    delete mParticleList;
+    mParticleList = nullptr;
+    delete mVSyncList;
+    mVSyncList = nullptr;
+}
+
+void Setup_Visual::apply()
+{
+    SetupTabScroll::apply();
+    Client::applyGrabMode();
+}
diff --git a/src/gui/setup_visual.h b/src/gui/setup_visual.h
new file mode 100644
index 000000000..028f366b8
--- /dev/null
+++ b/src/gui/setup_visual.h
@@ -0,0 +1,50 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef GUI_SETUP_VISUAL_H
+#define GUI_SETUP_VISUAL_H
+
+#include "guichanfwd.h"
+
+#include "gui/widgets/setupitem.h"
+#include "gui/widgets/setuptabscroll.h"
+
+class Setup_Visual : public SetupTabScroll
+{
+    public:
+        Setup_Visual();
+
+        ~Setup_Visual();
+
+        void apply();
+
+    private:
+        SetupItemNames *mSpeachList;
+
+        SetupItemNames *mAmbientFxList;
+
+        SetupItemNames *mParticleList;
+
+        SetupItemNames *mVSyncList;
+};
+
+#endif
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 1a27b8b0c..01b589ab6 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -753,7 +753,7 @@ void ShopWindow::processRequest(std::string nick, std::string data, int mode)
 
     if (config.getBoolValue("autoShop"))
     {
-        sound.playGuiSfx("system/newmessage.ogg");
+        sound.playGuiSound(SOUND_TRADE);
         startTrade();
     }
     else
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 287089790..f0ac9e128 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -1630,13 +1630,13 @@ void SocialWindow::showPartyCreate()
     if (player_node->getParty())
     {
         new OkDialog(_("Create Party"),
-                     _("Cannot create party. You are already in a party"),
-                     this);
+            _("Cannot create party. You are already in a party"),
+            DIALOG_ERROR, true, true, this);
         return;
     }
 
     mPartyCreateDialog = new TextDialog(_("Party Name"),
-                                        _("Choose your party's name."), this);
+        _("Choose your party's name."), this);
     mPartyCreateDialog->setActionEventId("create party");
     mPartyCreateDialog->addActionListener(this);
 }
diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp
index 66d69b197..9446f7515 100644
--- a/src/gui/spellpopup.cpp
+++ b/src/gui/spellpopup.cpp
@@ -3,7 +3,7 @@
  *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -18,8 +18,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/spellpopup.h"
@@ -114,8 +113,6 @@ void SpellPopup::view(int x, int y)
     {
         if (y > getHeight() + distance)
             posY = y - getHeight() - distance;
-        else
-            y = 0;
     }
 
     setPosition(posX, posY);
diff --git a/src/gui/spellpopup.h b/src/gui/spellpopup.h
index 883b2bfe0..e64b510fc 100644
--- a/src/gui/spellpopup.h
+++ b/src/gui/spellpopup.h
@@ -3,7 +3,7 @@
  *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -18,8 +18,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SPELLPOPUP_H
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 3e1f68d09..2d9cc69b6 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -3,7 +3,7 @@
  *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -18,8 +18,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/statuspopup.h"
diff --git a/src/gui/statuspopup.h b/src/gui/statuspopup.h
index 976b5e57b..e867f0fa9 100644
--- a/src/gui/statuspopup.h
+++ b/src/gui/statuspopup.h
@@ -3,7 +3,7 @@
  *  Copyright (C) 2008  The Legend of Mazzeroth Development Team
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -18,8 +18,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef StatusPopup_H
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 7d97549f3..3f98b4ea3 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/textcommandeditor.h"
@@ -128,7 +127,8 @@ const char *MAGIC_SCHOOL_TEXT[6] =
 class TargetTypeModel : public gcn::ListModel
 {
 public:
-    virtual ~TargetTypeModel() { }
+    virtual ~TargetTypeModel()
+    { }
 
     virtual int getNumberOfElements()
     {
@@ -147,7 +147,8 @@ public:
 class MagicSchoolModel : public gcn::ListModel
 {
 public:
-    virtual ~MagicSchoolModel() { }
+    virtual ~MagicSchoolModel()
+    { }
 
     virtual int getNumberOfElements()
     {
diff --git a/src/gui/textcommandeditor.h b/src/gui/textcommandeditor.h
index d0b2f0a54..39952f353 100644
--- a/src/gui/textcommandeditor.h
+++ b/src/gui/textcommandeditor.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef TEXTCOMMANDEDITOR_H
diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp
index 8cdbfa430..afece5319 100644
--- a/src/gui/textpopup.cpp
+++ b/src/gui/textpopup.cpp
@@ -18,8 +18,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/textpopup.h"
diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h
index 6f418152c..d06315171 100644
--- a/src/gui/textpopup.h
+++ b/src/gui/textpopup.h
@@ -18,8 +18,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef TEXTPOPUP_H
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 85fd215ac..3a09810d0 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -569,6 +569,25 @@ void Theme::fillFontsList(std::vector<std::string> &list)
     PHYSFS_permitSymbolicLinks(0);
 }
 
+void Theme::fillSoundsList(std::vector<std::string> &list)
+{
+    char **skins = PHYSFS_enumerateFiles(
+        branding.getStringValue("systemsounds").c_str());
+
+    for (char **i = skins; *i; i++)
+    {
+        if (!PHYSFS_isDirectory((
+            branding.getStringValue("systemsounds") + *i).c_str()))
+        {
+            std::string str = *i;
+            if (findCutLast(str, ".ogg"))
+                list.push_back(str);
+        }
+    }
+
+    PHYSFS_freeList(skins);
+}
+
 void Theme::selectSkin()
 {
     prepareThemePath();
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 9cb8f6180..c30044dc7 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -131,6 +131,8 @@ class Theme : public Palette, public ConfigListener
 
         static void fillFontsList(std::vector<std::string> &list);
 
+        static void fillSoundsList(std::vector<std::string> &list);
+
         /**
          * Returns the patch to the given gui resource relative to the theme
          * or, if it isn't in the theme, relative to 'graphics/gui'.
diff --git a/src/gui/unregisterdialog.cpp b/src/gui/unregisterdialog.cpp
index ca21263f1..9ba895ec8 100644
--- a/src/gui/unregisterdialog.cpp
+++ b/src/gui/unregisterdialog.cpp
@@ -134,7 +134,8 @@ void UnRegisterDialog::action(const gcn::ActionEvent &event)
         {
             mWrongDataNoticeListener->setTarget(this->mPasswordField);
 
-            OkDialog *dlg = new OkDialog(_("Error"), errorMsg.str());
+            OkDialog *dlg = new OkDialog(_("Error"),
+                errorMsg.str(), DIALOG_ERROR);
             dlg->addActionListener(mWrongDataNoticeListener);
         }
         else
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp
index 3aaf93557..9bac5e311 100644
--- a/src/gui/updaterwindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -298,9 +298,26 @@ void UpdaterWindow::loadNews()
 
     // Tokenize and add each line separately
     char *line = strtok(mMemoryBuffer, "\n");
+    bool firstLine(true);
     while (line)
     {
-        mBrowserBox->addRow(line);
+        if (firstLine)
+        {
+            firstLine = false;
+            std::string str = line;
+            unsigned i = str.find("##9 Latest client version: ##6");
+            if (!i)
+            {
+                line = strtok(nullptr, "\n");
+                continue;
+            }
+
+            mBrowserBox->addRow(str);
+        }
+        else
+        {
+            mBrowserBox->addRow(line);
+        }
         line = strtok(nullptr, "\n");
     }
 
@@ -332,6 +349,15 @@ void UpdaterWindow::loadPatch()
     if (line)
     {
         version = line;
+        if (serverVersion < 1)
+        {
+            line = strtok(nullptr, "\n");
+            if (line)
+            {
+                mBrowserBox->addRow("##9 Latest client version: ##6ManaPlus "
+                    + std::string(line), true);
+            }
+        }
         if (version > CHECK_VERSION)
         {
             mBrowserBox->addRow("", true);
@@ -554,8 +580,8 @@ void UpdaterWindow::logic()
         if (mUpdateFiles.size() && mUpdateIndex <= mUpdateFiles.size())
         {
             mProgressBar->setText(strprintf("%d/%d", mUpdateIndex
-                + mUpdateIndexOffset + 1, (int)mUpdateFiles.size()
-                + (int)mTempUpdateFiles.size() + 1));
+                + mUpdateIndexOffset + 1, static_cast<int>(mUpdateFiles.size())
+                + static_cast<int>(mTempUpdateFiles.size()) + 1));
         }
         else
         {
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 2e1e15c92..5c50836f6 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -98,11 +98,7 @@ Viewport::Viewport():
 
 Viewport::~Viewport()
 {
-    config.removeListener("ScrollLaziness", this);
-    config.removeListener("ScrollRadius", this);
-    config.removeListener("showBeingPopup", this);
-    config.removeListener("selfMouseHeal", this);
-    config.removeListener("enableLazyScrolling", this);
+    config.removeListeners(this);
 
     delete mPopupMenu;
     mPopupMenu = nullptr;
@@ -199,7 +195,8 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
 //                if (debugChatTab)
 //                    debugChatTab->chatLog("incorrect player position!");
                 logger->log("incorrect player position: %d, %d, %d, %d",
-                    player_x, player_y, (int)mPixelViewX, (int)mPixelViewY);
+                    player_x, player_y, static_cast<int>(mPixelViewX),
+                    static_cast<int>(mPixelViewY));
                 if (player_node)
                 {
                     logger->log("tile position: %d, %d",
@@ -412,7 +409,6 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
         return;
 
     // Check if we are alive and kickin'
-//    if (!mMap || !player_node || !player_node->isAlive())
     if (!mMap || !player_node)
         return;
 
@@ -421,7 +417,6 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
     if (Being::isTalking())
         return;
 
-
     const int pixelX = event.getX() + static_cast<int>(mPixelViewX);
     const int pixelY = event.getY() + static_cast<int>(mPixelViewY);
 
@@ -460,6 +455,13 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
             mPopupMenu->showPopup(event.getX(), event.getY(), mHoverSign);
             return;
         }
+        else if (mCameraMode)
+        {
+            mPopupMenu->showMapPopup(event.getX(), event.getY(),
+                (getMouseX() + getCameraX()) / mMap->getTileWidth(),
+                (getMouseY() + getCameraY()) / mMap->getTileHeight());
+            return;
+        }
     }
 
     // If a popup is active, just remove it
@@ -705,6 +707,11 @@ void Viewport::showUndressPopup(int x, int y, Being *being, Item *item)
     mPopupMenu->showUndressPopup(x, y, being, item);
 }
 
+void Viewport::showMapPopup(int x, int y)
+{
+    mPopupMenu->showMapPopup(getMouseX(), getMouseY(), x, y);
+}
+
 void Viewport::closePopupMenu()
 {
     if (mPopupMenu)
@@ -879,7 +886,7 @@ bool Viewport::isPopupMenuVisible()
 
 void Viewport::moveCameraToActor(int actorId, int x, int y)
 {
-    if (!player_node)
+    if (!player_node || !actorSpriteManager)
         return;
 
     Actor *actor = actorSpriteManager->findBeing(actorId);
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index ccb8124ba..ae6ff3d49 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -173,6 +173,8 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
 
         void showUndressPopup(int x, int y, Being *being, Item *item);
 
+        void showMapPopup(int x, int y);
+
         /**
          * Closes the popup menu. Needed for when the player dies or switching
          * maps.
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index 1efa9c22d..734daa7a6 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/whoisonline.h"
@@ -132,8 +131,7 @@ WhoIsOnline::WhoIsOnline():
 
 WhoIsOnline::~WhoIsOnline()
 {
-    config.removeListener("updateOnlineList", this);
-    config.removeListener("groupFriends", this);
+    config.removeListeners(this);
 
     if (mThread && SDL_GetThreadID(mThread))
         SDL_WaitThread(mThread, nullptr);
@@ -230,7 +228,7 @@ void WhoIsOnline::updateWindow(std::vector<OnlinePlayer*> &friends,
     if (addedFromSection == true && !disregard.empty())
     {
         mBrowserBox->addRow("---");
-        addedFromSection = false;
+//        addedFromSection = false;
     }
     for (int i = 0; i < static_cast<int>(disregard.size()); i++)
     {
@@ -739,7 +737,12 @@ void OnlinePlayer::setText(std::string color)
         Being *being = actorSpriteManager->findBeingByName(
             mNick, Being::PLAYER);
         if (being)
+        {
             being->setState(mStatus);
+            // for now highlight versions > 3
+            if (mVersion > 3)
+                being->setAdvanced(true);
+        }
     }
 
     if (mLevel > 0)
diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h
index 1607286a9..46fe74f62 100644
--- a/src/gui/whoisonline.h
+++ b/src/gui/whoisonline.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef WHOISONLINE_H
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 822e71805..749837f7d 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -74,8 +74,7 @@ AvatarListBox::AvatarListBox(AvatarListModel *model):
 
 AvatarListBox::~AvatarListBox()
 {
-    config.removeListener("showgender", this);
-    config.removeListener("showlevel", this);
+    config.removeListeners(this);
 
     instances--;
 
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 5856a91b1..47c5616b6 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -232,15 +232,17 @@ void BrowserBox::addRow(const std::string &row, bool atTop)
                         tempRow.substr(nextChar,
                         (nextSpacePos - nextChar)));
 
-                    if ((x + nextWordWidth + 10) > (unsigned)getWidth())
+                    if ((x + nextWordWidth + 10)
+                        > static_cast<unsigned>(getWidth()))
                     {
                         x = 15; // Ident in new line
                         y += 1;
-                        j++;
+                        j ++;
                     }
                 }
                 // Wrapping looong lines (brutal force)
-                else if ((x + 2 * hyphenWidth) > (unsigned)getWidth())
+                else if ((x + 2 * hyphenWidth)
+                         > static_cast<unsigned>(getWidth()))
                 {
                     x = 15; // Ident in new line
                     y += 1;
@@ -249,7 +251,7 @@ void BrowserBox::addRow(const std::string &row, bool atTop)
         }
 
         setHeight(font->getHeight() * (static_cast<int>(
-                  mTextRows.size()) + y));
+            mTextRows.size()) + y));
     }
     else
     {
@@ -423,7 +425,7 @@ int BrowserBox::calcHeight()
         if (row.find("---", 0) == 0)
         {
             const int dashWidth = fontWidthMinus;
-            for (x = 0; x < (unsigned)getWidth(); x++)
+            for (x = 0; x < static_cast<unsigned>(getWidth()); x ++)
             {
                 mLineParts.push_back(LinePart(x, y, selColor, "-", false));
                 x += dashWidth - 2;
@@ -557,9 +559,8 @@ int BrowserBox::calcHeight()
                 width = font->getWidth(part);
 
             // Auto wrap mode
-            if (mMode == AUTO_WRAP && getWidth() > 0
-                && width > 0
-                && (x + width + 10) > (unsigned)getWidth())
+            if (mMode == AUTO_WRAP && getWidth() > 0 && width > 0
+                && (x + width + 10) > static_cast<unsigned>(getWidth()))
             {
                 bool forced = false;
 
@@ -592,9 +593,8 @@ int BrowserBox::calcHeight()
                     else
                         width = font->getWidth(part);
                 }
-                while (end > start && width > 0
-                       && (x + width + 10)
-                       > (unsigned)getWidth());
+                while (end > start && width > 0 && (x + width + 10)
+                       > static_cast<unsigned>(getWidth()));
 
                 if (forced)
                 {
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index d82ebd758..b1582e077 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -104,7 +104,8 @@ class BrowserBox : public gcn::Widget,
         /**
          * Sets the maximum numbers of rows in the browser box. 0 = no limit.
          */
-        void setMaxRow(unsigned max) {mMaxRows = max; };
+        void setMaxRow(unsigned max)
+        { mMaxRows = max; };
 
         /**
          * Disable links & user defined colors to be used in chat input.
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 2867e3d39..c99f46149 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -32,6 +32,7 @@
 #include "gui/theme.h"
 
 #include "resources/image.h"
+#include "resources/imageset.h"
 
 #include "utils/dtor.h"
 
@@ -69,30 +70,92 @@ static ButtonData const data[BUTTON_COUNT] =
 
 ImageRect Button::button[BUTTON_COUNT];
 
-Button::Button():
+Button::Button() :
     mDescription(""), mClickCount(0),
     mTag(0),
     mVertexes(new GraphicsVertexes()),
     mRedraw(true),
     mMode(0),
     mXOffset(0),
-    mYOffset(0)
+    mYOffset(0),
+    mImages(nullptr),
+    mImageSet(nullptr)
 {
     init();
+    adjustSize();
 }
 
 Button::Button(const std::string &caption, const std::string &actionEventId,
-               gcn::ActionListener *listener):
+               gcn::ActionListener *listener) :
     gcn::Button(caption),
-    mDescription(""), mClickCount(0),
+    mDescription(""),
+    mClickCount(0),
+    mTag(0),
+    mVertexes(new GraphicsVertexes()),
+    mRedraw(true),
+    mMode(0),
+    mXOffset(0),
+    mYOffset(0),
+    mImages(nullptr),
+    mImageSet(nullptr),
+    mImageWidth(0),
+    mImageHeight(0)
+{
+    init();
+    adjustSize();
+    setActionEventId(actionEventId);
+
+    if (listener)
+        addActionListener(listener);
+}
+
+Button::Button(const std::string &caption, const std::string &imageName,
+               int imageWidth, int imageHeight,
+               const std::string &actionEventId,
+               gcn::ActionListener *listener) :
+    gcn::Button(caption),
+    mDescription(""),
+    mClickCount(0),
+    mTag(0),
+    mVertexes(new GraphicsVertexes()),
+    mRedraw(true),
+    mMode(0),
+    mXOffset(0),
+    mYOffset(0),
+    mImages(nullptr),
+    mImageSet(nullptr),
+    mImageWidth(imageWidth),
+    mImageHeight(imageHeight)
+{
+    init();
+    loadImage(imageName);
+    adjustSize();
+    setActionEventId(actionEventId);
+
+    if (listener)
+        addActionListener(listener);
+}
+
+Button::Button(const std::string &imageName, int imageWidth, int imageHeight,
+               const std::string &actionEventId,
+               gcn::ActionListener *listener) :
+    gcn::Button(""),
+    mDescription(""),
+    mClickCount(0),
     mTag(0),
     mVertexes(new GraphicsVertexes()),
     mRedraw(true),
     mMode(0),
     mXOffset(0),
-    mYOffset(0)
+    mYOffset(0),
+    mImages(nullptr),
+    mImageSet(nullptr),
+    mImageWidth(imageWidth),
+    mImageHeight(imageHeight)
 {
     init();
+    loadImage(imageName);
+    adjustSize();
     setActionEventId(actionEventId);
 
     if (listener)
@@ -158,6 +221,41 @@ Button::~Button()
             }
         }
     }
+    if (mImageSet)
+    {
+        mImageSet->decRef();
+        mImageSet = nullptr;
+    }
+    if (mImages)
+    {
+        for (int f = 0; f < BUTTON_COUNT; f ++)
+            mImages[f] = nullptr;
+        delete [] mImages;
+        mImages = nullptr;
+    }
+}
+
+void Button::loadImage(const std::string &imageName)
+{
+    if (mImageSet)
+    {
+        mImageSet->decRef();
+        mImageSet = nullptr;
+    }
+    mImageSet = Theme::getImageSetFromTheme(imageName,
+        mImageWidth, mImageHeight);
+    if (!mImageSet)
+        return;
+    mImages = new Image*[BUTTON_COUNT];
+    mImages[0] = nullptr;
+    for (int f = 0; f < BUTTON_COUNT; f ++)
+    {
+        Image *img = mImageSet->get(f);
+        if (img)
+            mImages[f] = img;
+        else
+            mImages[f] = mImages[0];
+    }
 }
 
 void Button::updateAlpha()
@@ -197,6 +295,7 @@ void Button::draw(gcn::Graphics *graphics)
 
     updateAlpha();
 
+    Graphics *g2 = static_cast<Graphics*>(graphics);
 
     bool recalc = false;
     if (mRedraw)
@@ -207,8 +306,7 @@ void Button::draw(gcn::Graphics *graphics)
     {
         // because we don't know where parent windows was moved,
         // need recalc vertexes
-        gcn::ClipRectangle &rect = static_cast<Graphics*>(
-            graphics)->getTopClip();
+        gcn::ClipRectangle &rect = g2->getTopClip();
         if (rect.xOffset != mXOffset || rect.yOffset != mYOffset)
         {
             recalc = true;
@@ -220,7 +318,7 @@ void Button::draw(gcn::Graphics *graphics)
             recalc = true;
             mMode = mode;
         }
-        else if (static_cast<Graphics*>(graphics)->getRedraw())
+        else if (g2->getRedraw())
         {
             recalc = true;
         }
@@ -230,45 +328,73 @@ void Button::draw(gcn::Graphics *graphics)
     {
         mRedraw = false;
         mMode = mode;
-        static_cast<Graphics*>(graphics)->calcWindow(mVertexes, 0, 0,
-            getWidth(), getHeight(), button[mode]);
+        g2->calcWindow(mVertexes, 0, 0, getWidth(), getHeight(), button[mode]);
     }
 
-    static_cast<Graphics*>(graphics)->drawImageRect2(
-        mVertexes, button[mode]);
+    g2->drawImageRect2(mVertexes, button[mode]);
 
-//    static_cast<Graphics*>(graphics)->
-//        drawImageRect(0, 0, getWidth(), getHeight(), button[mode]);
+//    g2->drawImageRect(0, 0, getWidth(), getHeight(), button[mode]);
 
     if (mode == BUTTON_DISABLED)
         graphics->setColor(mDisabledColor);
     else
         graphics->setColor(mEnabledColor);
 
-    int textX;
+    int textX = 0;
     int textY = getHeight() / 2 - getFont()->getHeight() / 2;
+    int imageX = 0;
+    int imageY = 0;
+    if (mImages)
+        imageY = getHeight() / 2 - mImageHeight / 2;
+
+// need move calculation from draw!!!
 
     switch (getAlignment())
     {
         default:
         case gcn::Graphics::LEFT:
-            textX = 4;
+            if (mImages)
+            {
+                imageX = 4;
+                textX = 4 + mImageWidth + 2;
+            }
+            else
+            {
+                textX = 4;
+            }
             break;
         case gcn::Graphics::CENTER:
-            textX = getWidth() / 2;
+            if (mImages)
+            {
+                int width = getFont()->getWidth(mCaption) + mImageWidth + 2;
+                imageX = getWidth() / 2 - width / 2;
+                textX = imageX + mImageWidth + 2;
+            }
+            else
+            {
+                textX = getWidth() / 2;
+            }
             break;
         case gcn::Graphics::RIGHT:
             textX = getWidth() - 4;
+            imageX = textX - getFont()->getWidth(mCaption) - 2;
             break;
-//            throw GCN_EXCEPTION("Button::draw. Unknown alignment.");
     }
 
     graphics->setFont(getFont());
 
     if (isPressed())
-        graphics->drawText(getCaption(), textX + 1, textY + 1, getAlignment());
+    {
+        if (mImages)
+            g2->drawImage(mImages[mode], imageX + 1, imageY + 1);
+        g2->drawText(getCaption(), textX + 1, textY + 1, getAlignment());
+    }
     else
-        graphics->drawText(getCaption(), textX, textY, getAlignment());
+    {
+        if (mImages)
+            g2->drawImage(mImages[mode], imageX, imageY);
+        g2->drawText(getCaption(), textX, textY, getAlignment());
+    }
 }
 
 void Button::mouseReleased(gcn::MouseEvent& mouseEvent)
@@ -298,3 +424,27 @@ void Button::widgetMoved(const gcn::Event &event A_UNUSED)
 {
     mRedraw = true;
 }
+
+void Button::adjustSize()
+{
+    if (mImages)
+    {
+        setWidth(getFont()->getWidth(mCaption)
+            + mImageWidth + 2 + 2 * mSpacing);
+        int height = getFont()->getHeight();
+        if (height < mImageHeight)
+            height = mImageHeight;
+        setHeight(height + 2 * mSpacing);
+    }
+    else
+    {
+        setWidth(getFont()->getWidth(mCaption) + 2 * mSpacing);
+        setHeight(getFont()->getHeight() + 2 * mSpacing);
+    }
+}
+
+void Button::setCaption(const std::string& caption)
+{
+    mCaption = caption;
+//    adjustSize();
+}
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 560e46377..6585d9850 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -28,8 +28,12 @@
 #include <guichan/widgetlistener.hpp>
 
 class GraphicsVertexes;
+class Image;
+class ImageSet;
 class ImageRect;
 
+const std::string BUTTON_PLAY = "buttonplay.png";
+
 /**
  * Button widget. Same as the Guichan button but with custom look.
  *
@@ -51,6 +55,23 @@ class Button : public gcn::Button, public gcn::WidgetListener
                gcn::ActionListener *listener);
 
         /**
+         * Constructor, sets the caption of the button to the given string and
+         * adds the given action listener.
+         */
+        Button(const std::string &caption, const std::string &imageName,
+               int imageWidth, int imageHeight,
+               const std::string &actionEventId,
+               gcn::ActionListener *listener);
+
+        /**
+         * Constructor, sets the caption of the button to the given string and
+         * adds the given action listener.
+         */
+        Button(const std::string &imageName, int imageWidth, int imageHeight,
+               const std::string &actionEventId,
+               gcn::ActionListener *listener);
+
+        /**
          * Destructor.
          */
         ~Button();
@@ -86,6 +107,12 @@ class Button : public gcn::Button, public gcn::WidgetListener
 
         void widgetMoved(const gcn::Event &event);
 
+        void loadImage(const std::string &imageName);
+
+        void adjustSize();
+
+        void setCaption(const std::string& caption);
+
     private:
         void init();
 
@@ -103,6 +130,10 @@ class Button : public gcn::Button, public gcn::WidgetListener
         int mYOffset;
         gcn::Color mEnabledColor;
         gcn::Color mDisabledColor;
+        Image **mImages;
+        ImageSet *mImageSet;
+        int mImageWidth;
+        int mImageHeight;
 };
 
 #endif
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 018e35030..be6a31164 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -289,9 +289,19 @@ void ChatTab::chatLog(std::string line, Own own,
             if (getFlash() == 0)
             {
                 if (chatWindow && chatWindow->findHighlight(tmp.text))
+                {
                     setFlash(2);
+                    sound.playGuiSound(SOUND_HIGHLIGHT);
+                }
                 else
+                {
                     setFlash(1);
+                }
+            }
+            else if (getFlash() == 2)
+            {
+                if (chatWindow && chatWindow->findHighlight(tmp.text))
+                    sound.playGuiSound(SOUND_HIGHLIGHT);
             }
         }
 
@@ -300,8 +310,10 @@ void ChatTab::chatLog(std::string line, Own own,
             || (Client::getIsMinimized() || (!Client::getMouseFocused()
             && !Client::getInputFocused()))))
         {
-            if (own != BY_SERVER)
-                sound.playGuiSfx("system/newmessage.ogg");
+            if (own == BY_GM)
+                sound.playGuiSound(SOUND_GLOBAL);
+            else if (own != BY_SERVER)
+                playNewMessageSound();
         }
     }
 }
@@ -468,3 +480,8 @@ void ChatTab::addNewRow(std::string &line)
     }
     mScrollArea->logic();
 }
+
+void ChatTab::playNewMessageSound()
+{
+    sound.playGuiSound(SOUND_WHISPER);
+}
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 912305a63..d67f56b54 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -162,6 +162,8 @@ class ChatTab : public Tab
 
         void addNewRow(std::string &line);
 
+        virtual void playNewMessageSound();
+
     protected:
         friend class ChatWindow;
         friend class WhisperWindow;
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index b40558c78..6352c300f 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -1,6 +1,7 @@
 /*
  *  Desktop widget
  *  Copyright (c) 2009-2010  The Mana World Development Team
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index b1f059ffe..e4edc8857 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -1,6 +1,7 @@
 /*
  *  Desktop widget
  *  Copyright (c) 2009-2010  The Mana World Development Team
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 8335a61bc..8c6aec68a 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/widgets/dropshortcutcontainer.h"
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 1f03fd53b..91e436836 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef DROPSHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 794357275..8d828a87e 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -1,6 +1,7 @@
 /*
  *  Extended support for activating emotes
  *  Copyright (C) 2009  Aethyra Development Team
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 743ca4e87..f509798bb 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -1,6 +1,7 @@
 /*
  *  Extended support for activating emotes
  *  Copyright (C) 2009  Aethyra Development Team
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 677dd3661..e5eeebdcb 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -43,7 +43,8 @@ class FlowContainer : public Container,
         /**
          * Destructor.
          */
-        ~FlowContainer() {}
+        ~FlowContainer()
+        { }
 
         /**
          * Invoked when a widget changes its size. This is used to determine
diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp
index a95fca3cf..bad34cfb3 100644
--- a/src/gui/widgets/guildchattab.cpp
+++ b/src/gui/widgets/guildchattab.cpp
@@ -27,6 +27,7 @@
 #include "guild.h"
 #include "guildmanager.h"
 #include "localplayer.h"
+#include "sound.h"
 
 #include "gui/theme.h"
 
@@ -126,3 +127,8 @@ void GuildChatTab::saveToLogFile(std::string &msg)
     if (chatLogger)
         chatLogger->log("#Guild", msg);
 }
+
+void GuildChatTab::playNewMessageSound()
+{
+    sound.playGuiSound(SOUND_GUILD);
+}
diff --git a/src/gui/widgets/guildchattab.h b/src/gui/widgets/guildchattab.h
index be6f4d034..e729844f4 100644
--- a/src/gui/widgets/guildchattab.h
+++ b/src/gui/widgets/guildchattab.h
@@ -44,6 +44,8 @@ class GuildChatTab : public ChatTab
         int getType() const
         { return ChatTab::TAB_GUILD; }
 
+        void playNewMessageSound();
+
     protected:
         void handleInput(const std::string &msg);
 
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index d620cbb8d..6434f5453 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -348,14 +348,15 @@ void GuiTable::draw(gcn::Graphics* graphics)
 
                 if (mSelectedRow > 0)
                 {
-                    if (mLinewiseMode && r == (unsigned)mSelectedRow && c == 0)
+                    if (mLinewiseMode && r == static_cast<unsigned>(
+                        mSelectedRow) && c == 0)
                     {
                         graphics->fillRectangle(gcn::Rectangle(0, y_offset,
-                                                getWidth(), height));
+                            getWidth(), height));
                     }
                     else if (!mLinewiseMode && mSelectedColumn > 0
-                             && c == (unsigned)mSelectedColumn
-                             && r == (unsigned)mSelectedRow)
+                             && c == static_cast<unsigned>(mSelectedColumn)
+                             && r == static_cast<unsigned>(mSelectedRow))
                     {
                         graphics->fillRectangle(gcn::Rectangle(
                             x_offset, y_offset, width, height));
diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp
index c128ea550..5bf81c5d8 100644
--- a/src/gui/widgets/horizontcontainer.cpp
+++ b/src/gui/widgets/horizontcontainer.cpp
@@ -34,11 +34,16 @@ HorizontContainer::HorizontContainer(int height, int spacing):
 
 void HorizontContainer::add(gcn::Widget *widget)
 {
+    add(widget, mSpacing);
+}
+
+void HorizontContainer::add(gcn::Widget *widget, int spacing)
+{
     if (!widget)
         return;
 
     Container::add(widget);
-    widget->setPosition(mLastX, mSpacing);
+    widget->setPosition(mLastX, spacing);
     mCount++;
     mLastX += widget->getWidth() + 2 * mSpacing;
 }
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 7439672dc..8e1d082ac 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -38,6 +38,8 @@ class HorizontContainer : public Container, public gcn::WidgetListener
 
         virtual void add(gcn::Widget *widget);
 
+        virtual void add(gcn::Widget *widget, int spacing);
+
         virtual void clear();
 
         void widgetResized(const gcn::Event &event);
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 67e8bd12b..640010c62 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -1,6 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (c) 2009  Aethyra Development Team 
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 775eda18c..f2048c94a 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -1,6 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (c) 2009  Aethyra Development Team 
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h
index 366899ffc..703f593f2 100644
--- a/src/gui/widgets/linkhandler.h
+++ b/src/gui/widgets/linkhandler.h
@@ -34,7 +34,8 @@
 class LinkHandler
 {
     public:
-        virtual ~LinkHandler() { }
+        virtual ~LinkHandler()
+        { }
 
         virtual void handleLink(const std::string &link,
                                 gcn::MouseEvent *event) = 0;
diff --git a/src/gui/widgets/namesmodel.cpp b/src/gui/widgets/namesmodel.cpp
new file mode 100644
index 000000000..abfcd6def
--- /dev/null
+++ b/src/gui/widgets/namesmodel.cpp
@@ -0,0 +1,51 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/widgets/namesmodel.h"
+
+#include "logger.h"
+
+#include "utils/gettext.h"
+
+#include <guichan/exception.hpp>
+#include <guichan/font.hpp>
+
+#include "debug.h"
+
+NamesModel::NamesModel()
+{
+}
+
+NamesModel::~NamesModel()
+{
+}
+
+int NamesModel::getNumberOfElements()
+{
+    return static_cast<int>(mNames.size());
+}
+
+std::string NamesModel::getElementAt(int i)
+{
+    if (i >= getNumberOfElements() || i < 0)
+        return _("???");
+
+    return mNames[i];
+}
diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h
new file mode 100644
index 000000000..dc694fc46
--- /dev/null
+++ b/src/gui/widgets/namesmodel.h
@@ -0,0 +1,51 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_WIDGETS_NAMESMODEL_H
+#define GUI_WIDGETS_NAMESMODEL_H
+
+//#include "guichanfwd.h"
+
+#include <guichan/listmodel.hpp>
+
+#include <vector>
+
+class NamesModel : public gcn::ListModel
+{
+    public:
+        NamesModel();
+
+        virtual ~NamesModel();
+
+        virtual int getNumberOfElements();
+
+        virtual std::string getElementAt(int i);
+
+        std::vector<std::string> &getNames()
+        { return mNames; }
+
+        size_t size()
+        { return mNames.size(); }
+
+    protected:
+        std::vector<std::string> mNames;
+};
+
+#endif
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 56ce0a25a..93854e823 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -23,8 +23,10 @@
 #include "configuration.h"
 #include "main.h"
 #include "logger.h"
+#include "sound.h"
 
 #include "gui/editdialog.h"
+#include "gui/gui.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
@@ -33,13 +35,19 @@
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
+#include "gui/widgets/slider.h"
+#include "gui/widgets/sliderlist.h"
 #include "gui/widgets/tabbedarea.h"
 #include "gui/widgets/textfield.h"
 #include "gui/widgets/vertcontainer.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
+#include "utils/mathutils.h"
 
+#include <guichan/font.hpp>
+
+#include "debug.h"
 
 SetupItem::SetupItem(std::string text, std::string description,
                      std::string keyName, SetupTabScroll *parent,
@@ -163,6 +171,12 @@ void SetupItem::externalUpdated(std::string eventName A_UNUSED)
     toWidget();
 }
 
+void SetupItem::fixFirstItemSize(gcn::Widget *widget)
+{
+    if (widget->getWidth() < mParent->getPreferredFirstItemSize())
+        widget->setWidth(mParent->getPreferredFirstItemSize());
+}
+
 SetupItemCheckBox::SetupItemCheckBox(std::string text, std::string description,
                                      std::string keyName,
                                      SetupTabScroll *parent,
@@ -271,6 +285,7 @@ void SetupItemTextField::createControls()
     mButton = new Button(_("Edit"), mEventName + "_EDIT", mParent);
     mWidget = mTextField;
     mTextField->setWidth(200);
+    fixFirstItemSize(mLabel);
     mHorizont->add(mLabel);
     mHorizont->add(mTextField);
     mHorizont->add(mButton);
@@ -394,6 +409,7 @@ void SetupItemIntTextField::createControls()
     mButton = new Button(_("Edit"), mEventName + "_EDIT", mParent);
     mWidget = mTextField;
     mTextField->setWidth(50);
+    fixFirstItemSize(mLabel);
     mHorizont->add(mLabel);
     mHorizont->add(mTextField);
     mHorizont->add(mButton);
@@ -564,6 +580,7 @@ void SetupItemDropDown::createControls()
 
     mWidget = mDropDown;
 //    mTextField->setWidth(50);
+    fixFirstItemSize(mLabel);
     mHorizont->add(mLabel);
     mHorizont->add(mDropDown);
 
@@ -588,3 +605,402 @@ void SetupItemDropDown::toWidget()
 
     mDropDown->setSelectedString(mValue);
 }
+
+
+SetupItemSlider::SetupItemSlider(std::string text, std::string description,
+                                 std::string keyName, SetupTabScroll *parent,
+                                 std::string eventName, double min, double max,
+                                 int width, bool onTheFly, bool mainConfig) :
+    SetupItem(text, description, keyName, parent, eventName, mainConfig),
+    mHorizont(nullptr),
+    mLabel(nullptr),
+    mSlider(nullptr),
+    mMin(min),
+    mMax(max),
+    mWidth(width),
+    mOnTheFly(onTheFly)
+{
+    mValueType = VSTR;
+    createControls();
+}
+
+SetupItemSlider::SetupItemSlider(std::string text, std::string description,
+                                 std::string keyName, SetupTabScroll *parent,
+                                 std::string eventName, double min, double max,
+                                 std::string def, int width, bool onTheFly,
+                                 bool mainConfig) :
+    SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
+    mHorizont(nullptr),
+    mLabel(nullptr),
+    mSlider(nullptr),
+    mMin(min),
+    mMax(max),
+    mWidth(width),
+    mOnTheFly(onTheFly)
+{
+    mValueType = VSTR;
+    createControls();
+}
+
+SetupItemSlider::~SetupItemSlider()
+{
+    mHorizont = nullptr;
+    mWidget = nullptr;
+    mSlider = nullptr;
+    mLabel = nullptr;
+}
+
+void SetupItemSlider::createControls()
+{
+    load();
+    mHorizont = new HorizontContainer(32, 2);
+
+    mLabel = new Label(mText);
+    mSlider = new Slider(mMin, mMax);
+    mSlider->setActionEventId(mEventName);
+    mSlider->addActionListener(mParent);
+    mSlider->setValue(atof(mValue.c_str()));
+    mSlider->setHeight(30);
+
+    mWidget = mSlider;
+    mSlider->setWidth(mWidth);
+    mSlider->setHeight(40);
+    fixFirstItemSize(mLabel);
+    mHorizont->add(mLabel);
+    mHorizont->add(mSlider, -10);
+
+    mParent->getContainer()->add2(mHorizont, true, 4);
+    mParent->addControl(this);
+    mParent->addActionListener(this);
+    mWidget->addActionListener(this);
+}
+
+void SetupItemSlider::fromWidget()
+{
+    if (!mSlider)
+        return;
+
+    mValue = toString(mSlider->getValue());
+}
+
+void SetupItemSlider::toWidget()
+{
+    if (!mSlider)
+        return;
+
+    mSlider->setValue(atof(mValue.c_str()));
+}
+
+void SetupItemSlider::action(const gcn::ActionEvent &event A_UNUSED)
+{
+    fromWidget();
+    if (mOnTheFly)
+        save();
+}
+
+void SetupItemSlider::apply(std::string eventName)
+{
+    if (eventName != mEventName)
+        return;
+
+    fromWidget();
+    save();
+}
+
+
+SetupItemSlider2::SetupItemSlider2(std::string text, std::string description,
+                                   std::string keyName, SetupTabScroll *parent,
+                                   std::string eventName, int min, int max,
+                                   SetupItemNames *values, bool onTheFly,
+                                   bool mainConfig) :
+    SetupItem(text, description, keyName, parent, eventName, mainConfig),
+    mHorizont(nullptr),
+    mLabel(nullptr),
+    mLabel2(nullptr),
+    mSlider(nullptr),
+    mValues(values),
+    mMin(min),
+    mMax(max),
+    mInvert(false),
+    mInvertValue(0),
+    mOnTheFly(onTheFly)
+{
+    mValueType = VSTR;
+    createControls();
+}
+
+SetupItemSlider2::SetupItemSlider2(std::string text, std::string description,
+                                   std::string keyName, SetupTabScroll *parent,
+                                   std::string eventName, int min, int max,
+                                   SetupItemNames *values, std::string def,
+                                   bool onTheFly, bool mainConfig) :
+    SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
+    mHorizont(nullptr),
+    mLabel(nullptr),
+    mLabel2(nullptr),
+    mSlider(nullptr),
+    mValues(values),
+    mMin(min),
+    mMax(max),
+    mInvert(false),
+    mInvertValue(0),
+    mOnTheFly(onTheFly)
+{
+    mValueType = VSTR;
+    createControls();
+}
+
+SetupItemSlider2::~SetupItemSlider2()
+{
+    mHorizont = nullptr;
+    mWidget = nullptr;
+    mSlider = nullptr;
+    mLabel = nullptr;
+}
+
+void SetupItemSlider2::createControls()
+{
+    load();
+    mHorizont = new HorizontContainer(32, 2);
+
+    int width = getMaxWidth();
+
+    mLabel = new Label(mText);
+    mLabel2 = new Label("");
+    mLabel2->setWidth(width);
+    mSlider = new Slider(mMin, mMax);
+    mSlider->setActionEventId(mEventName);
+    mSlider->addActionListener(mParent);
+    mSlider->setValue(atof(mValue.c_str()));
+    mSlider->setHeight(30);
+
+    mWidget = mSlider;
+    mSlider->setWidth(150);
+    mSlider->setHeight(40);
+    fixFirstItemSize(mLabel);
+    mHorizont->add(mLabel);
+    mHorizont->add(mSlider, -10);
+    mHorizont->add(mLabel2);
+
+    mParent->getContainer()->add2(mHorizont, true, 4);
+    mParent->addControl(this);
+    mParent->addActionListener(this);
+    mWidget->addActionListener(this);
+    updateLabel();
+}
+
+int SetupItemSlider2::getMaxWidth()
+{
+    if (!mValues || !gui)
+        return 1;
+
+    int maxWidth = 0;
+    SetupItemNamesConstIter it = mValues->begin();
+    SetupItemNamesConstIter it_end = mValues->end();
+    gcn::Font *font = gui->getFont();
+
+    while (it != it_end)
+    {
+        int w = font->getWidth(*it);
+        if (w > maxWidth)
+            maxWidth = w;
+
+        ++ it;
+    }
+    return maxWidth;
+}
+
+void SetupItemSlider2::fromWidget()
+{
+    if (!mSlider)
+        return;
+
+    int val = roundDouble(mSlider->getValue());
+    if (mInvert)
+        val = mInvertValue - val;
+    mValue = toString(val);
+}
+
+void SetupItemSlider2::toWidget()
+{
+    if (!mSlider)
+        return;
+
+    int val = roundDouble(atof(mValue.c_str()));
+    if (mInvert)
+        val = mInvertValue - val;
+    mSlider->setValue(val);
+    updateLabel();
+}
+
+void SetupItemSlider2::action(const gcn::ActionEvent &event A_UNUSED)
+{
+    fromWidget();
+    updateLabel();
+    if (mOnTheFly)
+        save();
+}
+
+void SetupItemSlider2::updateLabel()
+{
+    int val = mSlider->getValue() - mMin;
+    if (val < 0)
+        val = 0;
+    else if (val >= static_cast<signed>(mValues->size()))
+        val = static_cast<signed>(mValues->size()) - 1;
+    std::string str = mValues->at(val);
+    mLabel2->setCaption(str);
+}
+
+void SetupItemSlider2::apply(std::string eventName)
+{
+    if (eventName != mEventName)
+        return;
+
+    fromWidget();
+    save();
+}
+
+void SetupItemSlider2::setInvertValue(int v)
+{
+    mInvert = true;
+    mInvertValue = v;
+    toWidget();
+}
+
+
+SetupItemSliderList::SetupItemSliderList(std::string text,
+                                         std::string description,
+                                         std::string keyName,
+                                         SetupTabScroll *parent,
+                                         std::string eventName,
+                                         gcn::ListModel *model,
+                                         int width, bool onTheFly,
+                                         bool mainConfig) :
+    SetupItem(text, description, keyName, parent, eventName, mainConfig),
+    mHorizont(nullptr),
+    mLabel(nullptr),
+    mSlider(nullptr),
+    mModel(model),
+    mWidth(width),
+    mOnTheFly(onTheFly)
+{
+    mValueType = VSTR;
+//    createControls();
+}
+
+SetupItemSliderList::SetupItemSliderList(std::string text,
+                                         std::string description,
+                                         std::string keyName,
+                                         SetupTabScroll *parent,
+                                         std::string eventName,
+                                         gcn::ListModel *model,
+                                         std::string def, int width,
+                                         bool onTheFly, bool mainConfig) :
+    SetupItem(text, description, keyName, parent, eventName, def, mainConfig),
+    mHorizont(nullptr),
+    mLabel(nullptr),
+    mSlider(nullptr),
+    mModel(model),
+    mWidth(width),
+    mOnTheFly(onTheFly)
+{
+    mValueType = VSTR;
+//    createControls();
+}
+
+SetupItemSliderList::~SetupItemSliderList()
+{
+    mHorizont = nullptr;
+    mWidget = nullptr;
+    mSlider = nullptr;
+    mLabel = nullptr;
+}
+
+void SetupItemSliderList::createControls()
+{
+    load();
+    mHorizont = new HorizontContainer(32, 2);
+
+    mLabel = new Label(mText);
+    mSlider = new SliderList(mModel, mParent, mEventName);
+    mSlider->setSelectedString(mValue);
+    mSlider->adjustSize();
+
+    mWidget = mSlider;
+    fixFirstItemSize(mLabel);
+    mHorizont->add(mLabel, 5);
+    mHorizont->add(mSlider);
+
+    addMoreControls();
+
+    mParent->getContainer()->add2(mHorizont, true, 4);
+    mParent->addControl(this);
+    mParent->addActionListener(this);
+    mWidget->addActionListener(this);
+}
+
+void SetupItemSliderList::fromWidget()
+{
+    if (!mSlider)
+        return;
+
+    mValue = mSlider->getSelectedString();
+}
+
+void SetupItemSliderList::toWidget()
+{
+    if (!mSlider)
+        return;
+
+    mSlider->setSelectedString(mValue);
+}
+
+void SetupItemSliderList::action(const gcn::ActionEvent &event A_UNUSED)
+{
+    fromWidget();
+    if (mOnTheFly)
+        save();
+}
+
+void SetupItemSliderList::apply(std::string eventName)
+{
+    if (eventName != mEventName)
+        return;
+
+    fromWidget();
+    save();
+}
+
+SetupItemSound::SetupItemSound(std::string text, std::string description,
+                               std::string keyName, SetupTabScroll *parent,
+                               std::string eventName, gcn::ListModel *model,
+                               int width, bool onTheFly, bool mainConfig) :
+    SetupItemSliderList(text, description, keyName, parent, eventName,
+                        model, width, onTheFly, mainConfig),
+    mButton(nullptr)
+{
+    createControls();
+}
+
+void SetupItemSound::addMoreControls()
+{
+    mButton = new Button(BUTTON_PLAY, 16, 16, mEventName + "_PLAY", this);
+    mHorizont->add(mButton);
+}
+
+void SetupItemSound::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == mEventName + "_PLAY")
+    {
+        if (mSlider->getSelected())
+        {
+            sound.playGuiSfx(branding.getStringValue("systemsounds")
+                + mSlider->getSelectedString() + ".ogg");
+        }
+    }
+    else
+    {
+        SetupItemSliderList::action(event);
+    }
+}
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 71856d6e2..86fdf95f9 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -41,6 +41,8 @@ class EditDialog;
 class HorizontContainer;
 class IntTextField;
 class Label;
+class Slider;
+class SliderList;
 class TextField;
 
 class SetupItem : public gcn::ActionListener
@@ -91,11 +93,12 @@ class SetupItem : public gcn::ActionListener
         virtual void cancel(std::string eventName);
 
         virtual void externalUpdated(std::string eventName);
-//        virtual int add(ContainerPlacer &place, int x, int y, int width);
 
         bool isMainConfig() const
         { return mMainConfig; }
 
+        void fixFirstItemSize(gcn::Widget *widget);
+
     protected:
         std::string mText;
 
@@ -264,4 +267,148 @@ class SetupItemDropDown : public SetupItem
         DropDown *mDropDown;
 };
 
+class SetupItemSlider : public SetupItem
+{
+    public:
+        SetupItemSlider(std::string text, std::string description,
+                        std::string keyName, SetupTabScroll *parent,
+                        std::string eventName, double min, double max,
+                        int width = 150, bool onTheFly = false,
+                        bool mainConfig = true);
+
+        SetupItemSlider(std::string text, std::string description,
+                        std::string keyName, SetupTabScroll *parent,
+                        std::string eventName, double min, double max,
+                        std::string def, int width = 150,
+                        bool onTheFly = false, bool mainConfig = true);
+
+        ~SetupItemSlider();
+
+        void createControls();
+
+        void fromWidget();
+
+        void toWidget();
+
+        void action(const gcn::ActionEvent &event);
+
+        void apply(std::string eventName);
+
+        void updateLabel();
+
+    protected:
+        HorizontContainer *mHorizont;
+        Label *mLabel;
+        Slider *mSlider;
+        double mMin;
+        double mMax;
+        int mWidth;
+        bool mOnTheFly;
+};
+
+typedef std::vector<std::string> SetupItemNames;
+typedef SetupItemNames::iterator SetupItemNamesIter;
+typedef SetupItemNames::const_iterator SetupItemNamesConstIter;
+
+class SetupItemSlider2 : public SetupItem
+{
+    public:
+        SetupItemSlider2(std::string text, std::string description,
+                         std::string keyName, SetupTabScroll *parent,
+                         std::string eventName, int min, int max,
+                         SetupItemNames *values, bool onTheFly = false,
+                         bool mainConfig = true);
+
+        SetupItemSlider2(std::string text, std::string description,
+                         std::string keyName, SetupTabScroll *parent,
+                         std::string eventName, int min, int max,
+                         SetupItemNames *values, std::string def,
+                         bool onTheFly = false, bool mainConfig = true);
+
+        ~SetupItemSlider2();
+
+        void createControls();
+
+        void fromWidget();
+
+        void toWidget();
+
+        void action(const gcn::ActionEvent &event);
+
+        void apply(std::string eventName);
+
+        void setInvertValue(int v);
+
+    protected:
+        void updateLabel();
+
+        int getMaxWidth();
+
+        HorizontContainer *mHorizont;
+        Label *mLabel;
+        Label *mLabel2;
+        Slider *mSlider;
+        SetupItemNames *mValues;
+        int mMin;
+        int mMax;
+        bool mInvert;
+        int mInvertValue;
+        bool mOnTheFly;
+};
+
+class SetupItemSliderList : public SetupItem
+{
+    public:
+        SetupItemSliderList(std::string text, std::string description,
+                            std::string keyName, SetupTabScroll *parent,
+                            std::string eventName, gcn::ListModel *model,
+                            int width = 150, bool onTheFly = false,
+                            bool mainConfig = true);
+
+        SetupItemSliderList(std::string text, std::string description,
+                            std::string keyName, SetupTabScroll *parent,
+                            std::string eventName, gcn::ListModel *model,
+                            std::string def, int width = 150,
+                            bool onTheFly = false, bool mainConfig = true);
+
+        ~SetupItemSliderList();
+
+        void createControls();
+
+        void fromWidget();
+
+        void toWidget();
+
+        virtual void action(const gcn::ActionEvent &event);
+
+        void apply(std::string eventName);
+
+        virtual void addMoreControls() = 0;
+
+    protected:
+        HorizontContainer *mHorizont;
+        Label *mLabel;
+        SliderList *mSlider;
+        gcn::ListModel *mModel;
+        int mWidth;
+        bool mOnTheFly;
+};
+
+class SetupItemSound : public SetupItemSliderList
+{
+    public:
+        SetupItemSound(std::string text, std::string description,
+                       std::string keyName, SetupTabScroll *parent,
+                       std::string eventName, gcn::ListModel *model,
+                       int width = 150, bool onTheFly = false,
+                       bool mainConfig = true);
+
+        void action(const gcn::ActionEvent &event);
+
+        void addMoreControls();
+
+    protected:
+        Button *mButton;
+};
+
 #endif
diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp
index ab8f61a40..f3f8b1526 100644
--- a/src/gui/widgets/setuptabscroll.cpp
+++ b/src/gui/widgets/setuptabscroll.cpp
@@ -28,17 +28,14 @@
 #include "debug.h"
 
 SetupTabScroll::SetupTabScroll() :
-    SetupTab()
+    SetupTab(),
+    mPreferredFirstItemSize(200)
 {
-    mContainer = new VertContainer(32, false, 8);
+    mContainer = new VertContainer(25, false, 8);
     mScroll = new ScrollArea(mContainer);
     mScroll->setOpaque(false);
     mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
     mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_AUTO);
-
-//    LayoutHelper h(this);
-//    ContainerPlacer place = h.getPlacer(0, 0);
-//    place(0, 0, mScroll, 10, 10);
 }
 
 SetupTabScroll::~SetupTabScroll()
diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h
index d471ecfbc..e7151769e 100644
--- a/src/gui/widgets/setuptabscroll.h
+++ b/src/gui/widgets/setuptabscroll.h
@@ -55,11 +55,15 @@ class SetupTabScroll : public SetupTab
         virtual void action(const gcn::ActionEvent &event A_UNUSED)
         { }
 
+        int getPreferredFirstItemSize()
+        { return mPreferredFirstItemSize; }
+
     protected:
         VertContainer *mContainer;
         ScrollArea *mScroll;
         std::map<std::string, SetupItem*> mItems;
         std::set<SetupItem*> mAllItems;
+        int mPreferredFirstItemSize;
 };
 
 #endif
diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp
new file mode 100644
index 000000000..bc30bbe38
--- /dev/null
+++ b/src/gui/widgets/sliderlist.cpp
@@ -0,0 +1,216 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/widgets/sliderlist.h"
+
+#include "client.h"
+#include "logger.h"
+
+#include "gui/gui.h"
+
+#include "gui/widgets/button.h"
+#include "gui/widgets/label.h"
+
+#include "utils/dtor.h"
+
+#include <guichan/font.hpp>
+
+#include "debug.h"
+
+static const int buttonWidth = 27;
+static const int buttonSpace = 30;
+static const int sliderHeight = 30;
+
+SliderList::SliderList(gcn::ListModel *listModel,
+                       gcn::ActionListener* listener,
+                       std::string eventId) :
+    mListModel(listModel),
+    mOldWidth(0),
+    mSelectedIndex(0)
+{
+    mPrevEventId = eventId + "_prev";
+    mNextEventId = eventId + "_next";
+
+    setHeight(sliderHeight);
+
+    mButtons[0] = new Button("<", mPrevEventId, this);
+    mButtons[1] = new Button(">", mNextEventId, this);
+    mLabel = new Label("");
+    add(mButtons[0]);
+    add(mLabel);
+    add(mButtons[1]);
+
+    if (!eventId.empty())
+        setActionEventId(eventId);
+
+    if (listener)
+        addActionListener(listener);
+
+    updateLabel();
+    addMouseListener(this);
+}
+
+SliderList::~SliderList()
+{
+}
+
+void SliderList::updateAlpha()
+{
+    mButtons[0]->updateAlpha();
+    mButtons[1]->updateAlpha();
+}
+
+void SliderList::mouseWheelMovedUp(gcn::MouseEvent& mouseEvent)
+{
+    logger->log("SliderList::mouseWheelMovedUp");
+    setSelected(mSelectedIndex - 1);
+    mouseEvent.consume();
+}
+
+void SliderList::mouseWheelMovedDown(gcn::MouseEvent& mouseEvent)
+{
+    setSelected(mSelectedIndex + 1);
+    mouseEvent.consume();
+}
+
+void SliderList::resize()
+{
+    const int width = getWidth();
+
+    mButtons[0]->setWidth(buttonWidth);
+//    mLabel->setPosition(buttonSpace, 0);
+    mLabel->setWidth(width - buttonSpace * 2);
+    mButtons[1]->setPosition(width - buttonSpace + 3, 0);
+    mButtons[1]->setWidth(buttonWidth);
+    updateLabel();
+}
+
+void SliderList::draw(gcn::Graphics *graphics)
+{
+    if (mOldWidth != getWidth())
+    {
+        resize();
+        mOldWidth = getWidth();
+    }
+    Container::draw(graphics);
+}
+
+void SliderList::updateLabel()
+{
+    if (!mListModel || mSelectedIndex < 0
+        || mSelectedIndex >= mListModel->getNumberOfElements())
+    {
+        return;
+    }
+
+    mLabel->setCaption(mListModel->getElementAt(mSelectedIndex));
+    mLabel->adjustSize();
+    const int space = getWidth() - buttonSpace * 2;
+    const int labelWidth = mLabel->getWidth();
+    int labelY = (getHeight() - mLabel->getHeight()) / 2;
+    if (labelY < 0)
+        labelY = 0;
+
+    if (space < 0 || space < labelWidth)
+        mLabel->setPosition(buttonSpace, labelY);
+    else
+        mLabel->setPosition(buttonSpace + (space - labelWidth) / 2, labelY);
+}
+
+void SliderList::action(const gcn::ActionEvent &event)
+{
+    if (!mListModel)
+        return;
+
+    if (event.getId() == mPrevEventId)
+    {
+        mSelectedIndex --;
+        if (mSelectedIndex < 0)
+            mSelectedIndex = mListModel->getNumberOfElements() - 1;
+    }
+    else if (event.getId() == mNextEventId)
+    {
+        mSelectedIndex ++;
+        if (mSelectedIndex >= mListModel->getNumberOfElements())
+            mSelectedIndex = 0;
+    }
+    updateLabel();
+    distributeActionEvent();
+}
+
+void SliderList::setSelectedString(std::string str)
+{
+    if (!mListModel)
+        return;
+
+    for (int f = 0; f < mListModel->getNumberOfElements(); f ++)
+    {
+        if (mListModel->getElementAt(f) == str)
+        {
+            setSelected(f);
+            break;
+        }
+    }
+}
+
+std::string SliderList::getSelectedString() const
+{
+    if (!mListModel)
+        return "";
+
+    return mListModel->getElementAt(mSelectedIndex);
+}
+
+void SliderList::setSelected(int idx)
+{
+    if (!mListModel)
+        return;
+
+    mSelectedIndex = idx;
+    if (mSelectedIndex >= mListModel->getNumberOfElements())
+        mSelectedIndex = 0;
+    if (mSelectedIndex < 0)
+        mSelectedIndex = mListModel->getNumberOfElements() - 1;
+    updateLabel();
+}
+
+void SliderList::adjustSize()
+{
+    setWidth(getMaxLabelWidth() + 60);
+    updateLabel();
+}
+
+int SliderList::getMaxLabelWidth()
+{
+    if (!mListModel || !gui)
+        return 1;
+
+    int maxWidth = 0;
+    gcn::Font *font = gui->getFont();
+
+    for (int f = 0; f < mListModel->getNumberOfElements(); f ++)
+    {
+        int w = font->getWidth(mListModel->getElementAt(f));
+        if (w > maxWidth)
+            maxWidth = w;
+    }
+
+    return maxWidth;
+}
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
new file mode 100644
index 000000000..b2239834d
--- /dev/null
+++ b/src/gui/widgets/sliderlist.h
@@ -0,0 +1,83 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_WIDGETS_SLIDERLIST_H
+#define GUI_WIDGETS_SLIDERLIST_H
+
+#include <guichan/actionlistener.hpp>
+#include <guichan/listmodel.hpp>
+#include <guichan/mouselistener.hpp>
+
+#include "gui/widgets/container.h"
+
+#include "localconsts.h"
+
+class Button;
+class Label;
+
+class SliderList : public Container,
+                   public gcn::ActionListener,
+                   public gcn::MouseListener
+{
+    public:
+        SliderList(gcn::ListModel *listModel = nullptr,
+                   gcn::ActionListener* listener = nullptr,
+                   std::string eventId = "");
+
+        ~SliderList();
+
+        void updateAlpha();
+
+        void mouseWheelMovedUp(gcn::MouseEvent& mouseEvent);
+
+        void mouseWheelMovedDown(gcn::MouseEvent& mouseEvent);
+
+        void resize();
+
+        void draw(gcn::Graphics *graphics);
+
+        void action(const gcn::ActionEvent &event);
+
+        void setSelectedString(std::string str);
+
+        std::string getSelectedString() const;
+
+        void setSelected(int idx);
+
+        void adjustSize();
+
+        int getSelected()
+        { return mSelectedIndex; }
+
+    protected:
+        void updateLabel();
+
+        int getMaxLabelWidth();
+
+        Button *mButtons[2];
+        Label *mLabel;
+        gcn::ListModel *mListModel;
+        std::string mPrevEventId;
+        std::string mNextEventId;
+        int mOldWidth;
+        int mSelectedIndex;
+};
+
+#endif // end GUI_WIDGETS_SLIDERLIST_H
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 5c4dbc9a1..07ecbfaf0 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gui/widgets/spellshortcutcontainer.h"
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 4191f9921..72fec758f 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SPELLSHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index 40a350163..e931888e4 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -42,7 +42,8 @@ public:
      */
     virtual void modelUpdated(bool completed) = 0;
 
-    virtual ~TableModelListener() {}
+    virtual ~TableModelListener()
+    { }
 };
 
 /**
diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp
index a4bc3bc09..575036612 100644
--- a/src/gui/widgets/textbox.cpp
+++ b/src/gui/widgets/textbox.cpp
@@ -116,14 +116,14 @@ void TextBox::setTextWrapped(const std::string &text, int minDimension)
                     mMinWidth = minWidth;
                     wrappedStream.clear();
                     wrappedStream.str("");
-                    spacePos = 0;
+//                    spacePos = 0;
                     lastNewlinePos = 0;
                     newlinePos = text.find("\n", lastNewlinePos);
                     if (newlinePos == std::string::npos)
                         newlinePos = text.size();
                     line = text.substr(lastNewlinePos, newlinePos -
                                        lastNewlinePos);
-                    width = 0;
+//                    width = 0;
                     break;
                 }
                 else
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index e207b0613..a90712340 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -183,7 +183,7 @@ int TextField::getValue() const
     if (value < mMinimum)
         return mMinimum;
 
-    if (value > (signed)mMaximum)
+    if (value > static_cast<signed>(mMaximum))
         return mMaximum;
 
     return value;
diff --git a/src/gui/worldselectdialog.cpp b/src/gui/worldselectdialog.cpp
index 917605281..19e6b81f7 100644
--- a/src/gui/worldselectdialog.cpp
+++ b/src/gui/worldselectdialog.cpp
@@ -54,7 +54,8 @@ class WorldListModel : public gcn::ListModel
         {
         }
 
-        virtual ~WorldListModel() {}
+        virtual ~WorldListModel()
+        { }
 
         int getNumberOfElements()
         {
diff --git a/src/guichan/color.cpp b/src/guichan/color.cpp
index d3dc7a738..f58e7b58e 100644
--- a/src/guichan/color.cpp
+++ b/src/guichan/color.cpp
@@ -97,23 +97,23 @@ namespace gcn
                      b - color.b, 
                      255);
 
-        result.r = (result.r>255?255:(result.r<0?0:result.r));
-        result.g = (result.g>255?255:(result.g<0?0:result.g));
-        result.b = (result.b>255?255:(result.b<0?0:result.b));
+        result.r = (result.r > 255 ? 255 : (result.r < 0 ? 0 : result.r));
+        result.g = (result.g > 255 ? 255 : (result.g < 0 ? 0 : result.g));
+        result.b = (result.b > 255 ? 255 : (result.b < 0 ? 0 : result.b));
 
         return result;
     }
 
     Color Color::operator*(float value) const
     {
-        Color result((int)(r * value), 
-                     (int)(g * value), 
-                     (int)(b * value), 
+        Color result(static_cast<int>(r * value), 
+                     static_cast<int>(g * value), 
+                     static_cast<int>(b * value), 
                      a);
 
-        result.r = (result.r>255?255:(result.r<0?0:result.r));
-        result.g = (result.g>255?255:(result.g<0?0:result.g));
-        result.b = (result.b>255?255:(result.b<0?0:result.b));
+        result.r = (result.r > 255 ? 255 : (result.r < 0 ? 0 : result.r));
+        result.g = (result.g > 255 ? 255 : (result.g < 0 ? 0 : result.g));
+        result.b = (result.b > 255 ? 255 : (result.b < 0 ? 0 : result.b));
 
         return result;
     }
diff --git a/src/guichan/defaultfont.cpp b/src/guichan/defaultfont.cpp
index 8871d51de..70901bc8e 100644
--- a/src/guichan/defaultfont.cpp
+++ b/src/guichan/defaultfont.cpp
@@ -89,7 +89,7 @@ namespace gcn
 
     int DefaultFont::getStringIndexAt(const std::string& text, int x) const
     {
-        if (x > (int)text.size() * 8)
+        if (x > static_cast<int>(text.size() * 8))
             return text.size();
 
         return x / 8;
diff --git a/src/guichan/focushandler.cpp b/src/guichan/focushandler.cpp
index 832a201ad..e3610fb1e 100644
--- a/src/guichan/focushandler.cpp
+++ b/src/guichan/focushandler.cpp
@@ -158,7 +158,7 @@ namespace gcn
     {
         int i;
         int focusedWidget = -1;
-        for (i = 0; i < (int)mWidgets.size(); ++i)
+        for (i = 0; i < static_cast<int>(mWidgets.size()); ++i)
         {
             if (mWidgets[i] == mFocusedWidget)
                 focusedWidget = i;
@@ -167,7 +167,7 @@ namespace gcn
 
         // i is a counter that ensures that the following loop
         // won't get stuck in an infinite loop
-        i = (int)mWidgets.size();
+        i = static_cast<int>(mWidgets.size());
         do
         {
             ++ focusedWidget;
@@ -180,7 +180,7 @@ namespace gcn
 
             -- i;
 
-            if (focusedWidget >= (int)mWidgets.size())
+            if (focusedWidget >= static_cast<int>(mWidgets.size()))
                 focusedWidget = 0;
 
             if (focusedWidget == focused)
@@ -213,7 +213,7 @@ namespace gcn
 
         int i;
         int focusedWidget = -1;
-        for (i = 0; i < (int)mWidgets.size(); ++ i)
+        for (i = 0; i < static_cast<int>(mWidgets.size()); ++ i)
         {
             if (mWidgets[i] == mFocusedWidget)
                 focusedWidget = i;
@@ -222,7 +222,7 @@ namespace gcn
 
         // i is a counter that ensures that the following loop
         // won't get stuck in an infinite loop
-        i = (int)mWidgets.size();
+        i = static_cast<int>(mWidgets.size());
         do
         {
             -- focusedWidget;
@@ -342,7 +342,7 @@ namespace gcn
 
         int i;
         int focusedWidget = -1;
-        for (i = 0; i < (int)mWidgets.size(); ++i)
+        for (i = 0; i < static_cast<int>(mWidgets.size()); ++ i)
         {
             if (mWidgets[i] == mFocusedWidget)
                 focusedWidget = i;
@@ -352,7 +352,7 @@ namespace gcn
 
         // i is a counter that ensures that the following loop
         // won't get stuck in an infinite loop
-        i = (int)mWidgets.size();
+        i = static_cast<int>(mWidgets.size());
         do
         {
             ++ focusedWidget;
@@ -365,7 +365,7 @@ namespace gcn
 
             -- i;
 
-            if (focusedWidget >= (int)mWidgets.size())
+            if (focusedWidget >= static_cast<int>(mWidgets.size()))
                 focusedWidget = 0;
 
             if (focusedWidget == focused)
@@ -411,7 +411,7 @@ namespace gcn
 
         int i;
         int focusedWidget = -1;
-        for (i = 0; i < (int)mWidgets.size(); ++i)
+        for (i = 0; i < static_cast<int>(mWidgets.size()); ++ i)
         {
             if (mWidgets[i] == mFocusedWidget)
                 focusedWidget = i;
@@ -421,7 +421,7 @@ namespace gcn
 
         // i is a counter that ensures that the following loop
         // won't get stuck in an infinite loop
-        i = (int)mWidgets.size();
+        i = static_cast<int>(mWidgets.size());
         do
         {
             -- focusedWidget;
diff --git a/src/guichan/include/guichan/actionlistener.hpp b/src/guichan/include/guichan/actionlistener.hpp
index 28373f2df..5991486a7 100644
--- a/src/guichan/include/guichan/actionlistener.hpp
+++ b/src/guichan/include/guichan/actionlistener.hpp
@@ -67,7 +67,8 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~ActionListener() { }
+        virtual ~ActionListener()
+        { }
 
         /**
          * Called when an action is recieved from a widget. It is used
@@ -86,8 +87,8 @@ namespace gcn
          * You should not be able to make an instance of ActionListener,
          * therefore its constructor is protected.
          */
-        ActionListener() { }
-
+        ActionListener()
+        { }
     };
 }
 
diff --git a/src/guichan/include/guichan/deathlistener.hpp b/src/guichan/include/guichan/deathlistener.hpp
index 5e983e02d..b2061e036 100644
--- a/src/guichan/include/guichan/deathlistener.hpp
+++ b/src/guichan/include/guichan/deathlistener.hpp
@@ -66,7 +66,8 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~DeathListener() { }
+        virtual ~DeathListener()
+        { }
 
         /**
          * Called when a widget dies. It is used to be able to recieve
@@ -83,8 +84,8 @@ namespace gcn
          * You should not be able to make an instance of DeathListener,
          * therefore its constructor is protected.
          */
-        DeathListener() { }
-
+        DeathListener()
+        { }
     };
 }
 
diff --git a/src/guichan/include/guichan/focushandler.hpp b/src/guichan/include/guichan/focushandler.hpp
index 4caba6f7b..9fa7ddeb7 100644
--- a/src/guichan/include/guichan/focushandler.hpp
+++ b/src/guichan/include/guichan/focushandler.hpp
@@ -80,7 +80,8 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~FocusHandler() { };
+        virtual ~FocusHandler()
+        { };
 
         /**
          * Requests focus for a widget. Focus will only be granted to a widget
diff --git a/src/guichan/include/guichan/focuslistener.hpp b/src/guichan/include/guichan/focuslistener.hpp
index 9ec53b860..3876e8518 100644
--- a/src/guichan/include/guichan/focuslistener.hpp
+++ b/src/guichan/include/guichan/focuslistener.hpp
@@ -72,21 +72,24 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~FocusListener() { }
+        virtual ~FocusListener()
+        { }
 
         /**
          * Called when a widget gains focus. 
          *
          * @param event Discribes the event.
          */
-        virtual void focusGained(const Event& event A_UNUSED) { };
+        virtual void focusGained(const Event& event A_UNUSED)
+        { };
 
         /**
          * Called when a widget loses focus. 
          *
          * @param event Discribes the event.
          */
-        virtual void focusLost(const Event& event A_UNUSED) { };
+        virtual void focusLost(const Event& event A_UNUSED)
+        { };
 
     protected:
         /**
@@ -95,7 +98,8 @@ namespace gcn
          * You should not be able to make an instance of FocusListener,
          * therefore its constructor is protected.
          */
-        FocusListener() { }
+        FocusListener()
+        { }
     };
 }
 
diff --git a/src/guichan/include/guichan/graphics.hpp b/src/guichan/include/guichan/graphics.hpp
index efefa3d73..d10c63ae1 100644
--- a/src/guichan/include/guichan/graphics.hpp
+++ b/src/guichan/include/guichan/graphics.hpp
@@ -113,7 +113,8 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~Graphics() { }
+        virtual ~Graphics()
+        { }
 
         /**
          * Initializes drawing. Called by the Gui when Gui::draw() is called.
@@ -126,7 +127,8 @@ namespace gcn
          *
          * @see _endDraw, Gui::draw
          */
-        virtual void _beginDraw() { }
+        virtual void _beginDraw()
+        { }
 
         /**
          * Deinitializes drawing. Called by the Gui when a Gui::draw() is done.
@@ -137,7 +139,8 @@ namespace gcn
          *
          * @see _beginDraw, Gui::draw
          */
-        virtual void _endDraw() { }
+        virtual void _endDraw()
+        { }
 
         /**
          * Pushes a clip area onto the stack. The x and y coordinates in the
diff --git a/src/guichan/include/guichan/keylistener.hpp b/src/guichan/include/guichan/keylistener.hpp
index a6d6f851d..9f90a1ffc 100644
--- a/src/guichan/include/guichan/keylistener.hpp
+++ b/src/guichan/include/guichan/keylistener.hpp
@@ -70,7 +70,8 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~KeyListener() { }
+        virtual ~KeyListener()
+        { }
 
         /**
          * Called if a key is pressed when the widget has keyboard focus.
@@ -79,14 +80,16 @@ namespace gcn
          *
          * @param keyEvent Discribes the event.
          */
-        virtual void keyPressed(KeyEvent& keyEvent A_UNUSED) { }
+        virtual void keyPressed(KeyEvent& keyEvent A_UNUSED)
+        { }
 
         /**
          * Called if a key is released when the widget has keyboard focus.
          *
          * @param keyEvent Discribes the event.
          */
-        virtual void keyReleased(KeyEvent& keyEvent A_UNUSED) { }
+        virtual void keyReleased(KeyEvent& keyEvent A_UNUSED)
+        { }
 
     protected:
         /**
@@ -95,7 +98,8 @@ namespace gcn
          * You should not be able to make an instance of KeyListener,
          * therefore its constructor is protected.
          */
-        KeyListener() { }
+        KeyListener()
+        { }
     };
 }
 
diff --git a/src/guichan/include/guichan/listmodel.hpp b/src/guichan/include/guichan/listmodel.hpp
index 612a5d4bd..bf139afb1 100644
--- a/src/guichan/include/guichan/listmodel.hpp
+++ b/src/guichan/include/guichan/listmodel.hpp
@@ -65,7 +65,8 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~ListModel() { }
+        virtual ~ListModel()
+        { }
 
         /**
          * Gets the number of elements in the list.
diff --git a/src/guichan/include/guichan/mouselistener.hpp b/src/guichan/include/guichan/mouselistener.hpp
index 2f12ecdac..b78f529e9 100644
--- a/src/guichan/include/guichan/mouselistener.hpp
+++ b/src/guichan/include/guichan/mouselistener.hpp
@@ -69,7 +69,8 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~MouseListener() { }
+        virtual ~MouseListener()
+        { }
 
         /**
          * Called when the mouse has entered into the widget area.
@@ -183,7 +184,8 @@ namespace gcn
          * You should not be able to make an instance of MouseListener,
          * therefore its constructor is protected.
          */
-        MouseListener() { }
+        MouseListener()
+        { }
     };
 }
 
diff --git a/src/guichan/include/guichan/sdl/sdlpixel.hpp b/src/guichan/include/guichan/sdl/sdlpixel.hpp
index a0221ca7c..23298ef37 100644
--- a/src/guichan/include/guichan/sdl/sdlpixel.hpp
+++ b/src/guichan/include/guichan/sdl/sdlpixel.hpp
@@ -68,7 +68,8 @@ namespace gcn
 
         SDL_LockSurface(surface);
 
-        Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * bpp;
+        Uint8 *p = static_cast<Uint8*>(surface->pixels)
+            + y * surface->pitch + x * bpp;
 
         unsigned int color = 0;
 
@@ -79,7 +80,7 @@ namespace gcn
                 break;
 
             case 2:
-                color = *(Uint16 *)p;
+                color = *reinterpret_cast<Uint16*>(p);
                 break;
 
             case 3:
@@ -90,7 +91,7 @@ namespace gcn
                 break;
 
           case 4:
-                color = *(Uint32 *)p;
+                color = *reinterpret_cast<Uint32*>(p);
                 break;
 
           default:
@@ -123,7 +124,8 @@ namespace gcn
 
         SDL_LockSurface(surface);
 
-        Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * bpp;
+        Uint8 *p = static_cast<Uint8*>(surface->pixels)
+            + y * surface->pitch + x * bpp;
 
         Uint32 pixel = SDL_MapRGB(surface->format, color.r, color.g, color.b);
 
@@ -134,7 +136,7 @@ namespace gcn
                 break;
 
             case 2:
-                *(Uint16 *)p = pixel;
+                *reinterpret_cast<Uint16*>(p) = pixel;
                 break;
 
             case 3:
@@ -153,7 +155,7 @@ namespace gcn
                 break;
 
             case 4:
-                *(Uint32 *)p = pixel;
+                *reinterpret_cast<Uint32*>(p) = pixel;
                 break;
 
             default:
@@ -199,7 +201,7 @@ namespace gcn
         unsigned int r = ((src & f->Bmask) * a + (dst & f->Bmask)
             * (255 - a)) >> 8;
 
-        return (unsigned short)((b & f->Rmask)
+        return static_cast<unsigned short>((b & f->Rmask)
             | (g & f->Gmask) | (r & f->Bmask));
     }
 
@@ -230,7 +232,8 @@ namespace gcn
 
         SDL_LockSurface(surface);
 
-        Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * bpp;
+        Uint8 *p = static_cast<Uint8*>(surface->pixels)
+            + y * surface->pitch + x * bpp;
 
         Uint32 pixel = SDL_MapRGB(surface->format, color.r, color.g, color.b);
 
@@ -241,8 +244,8 @@ namespace gcn
                 break;
 
             case 2:
-                *(Uint16 *)p = SDLAlpha16(pixel, *(Uint32 *)p,
-                    color.a, surface->format);
+                *reinterpret_cast<Uint16*>(p) = SDLAlpha16(pixel,
+                    *reinterpret_cast<Uint32*>(p), color.a, surface->format);
                 break;
 
             case 3:
@@ -275,7 +278,8 @@ namespace gcn
                 break;
 
             case 4:
-                *(Uint32 *)p = SDLAlpha32(pixel, *(Uint32 *)p, color.a);
+                *reinterpret_cast<Uint32*>(p) = SDLAlpha32(pixel,
+                    *reinterpret_cast<Uint32*>(p), color.a);
                 break;
             default:
                 break;
diff --git a/src/guichan/include/guichan/widget.hpp b/src/guichan/include/guichan/widget.hpp
index 69126e3df..b6146b791 100644
--- a/src/guichan/include/guichan/widget.hpp
+++ b/src/guichan/include/guichan/widget.hpp
@@ -173,7 +173,8 @@ namespace gcn
          * @see Gui::logic
          * @since 0.1.0
          */
-        virtual void logic() { }
+        virtual void logic()
+        { }
 
         /**
          * Gets the widget's parent container.
@@ -686,7 +687,8 @@ namespace gcn
          *
          * @since 0.1.0
          */
-        virtual void fontChanged() { }
+        virtual void fontChanged()
+        { }
 
         /**
          * Checks if a widget exists or not, that is if it still exists
@@ -895,7 +897,8 @@ namespace gcn
          * @see moveToBottom
          * @since 0.1.0
          */
-        virtual void moveToTop(Widget* widget A_UNUSED) { };
+        virtual void moveToTop(Widget* widget A_UNUSED)
+        { };
 
         /**
          * Moves a widget in this widget to the bottom of this widget.
@@ -905,7 +908,8 @@ namespace gcn
          * @see moveToTop
          * @since 0.1.0
          */
-        virtual void moveToBottom(Widget* widget A_UNUSED) { };
+        virtual void moveToBottom(Widget* widget A_UNUSED)
+        { };
 
         /**
          * Focuses the next widget in the widget.
@@ -913,7 +917,8 @@ namespace gcn
          * @see moveToBottom
          * @since 0.1.0
          */
-        virtual void focusNext() { };
+        virtual void focusNext()
+        { };
 
         /**
          * Focuses the previous widget in the widget.
@@ -921,7 +926,8 @@ namespace gcn
          * @see moveToBottom
          * @since 0.1.0
          */
-        virtual void focusPrevious() { };
+        virtual void focusPrevious()
+        { };
 
         /**
          * Tries to show a specific part of a widget by moving it. Used if the
diff --git a/src/guichan/include/guichan/widgetlistener.hpp b/src/guichan/include/guichan/widgetlistener.hpp
index 0ede5b871..f0cb60fd3 100644
--- a/src/guichan/include/guichan/widgetlistener.hpp
+++ b/src/guichan/include/guichan/widgetlistener.hpp
@@ -74,7 +74,8 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~WidgetListener() { }
+        virtual ~WidgetListener()
+        { }
 
         /**
          * Invoked when a widget changes its size.
@@ -82,7 +83,8 @@ namespace gcn
          * @param event Describes the event.
          * @since 0.8.0
          */
-        virtual void widgetResized(const Event& event A_UNUSED) { }
+        virtual void widgetResized(const Event& event A_UNUSED)
+        { }
 
         /**
          * Invoked when a widget is moved.
@@ -90,7 +92,8 @@ namespace gcn
          * @param event Describes the event.
          * @since 0.8.0
          */
-        virtual void widgetMoved(const Event& event A_UNUSED) { }
+        virtual void widgetMoved(const Event& event A_UNUSED)
+        { }
 
         /**
          * Invoked when a widget is hidden, i.e it's set to be
@@ -99,7 +102,8 @@ namespace gcn
          * @param event Describes the event.
          * @since 0.8.0
          */
-        virtual void widgetHidden(const Event& event A_UNUSED) { }
+        virtual void widgetHidden(const Event& event A_UNUSED)
+        { }
 
         /**
          * Invoked when a widget is shown, i.e it's set to be
@@ -108,7 +112,8 @@ namespace gcn
          * @param event Describes the event.
          * @since 0.8.0
          */
-        virtual void widgetShown(const Event& event A_UNUSED) { }
+        virtual void widgetShown(const Event& event A_UNUSED)
+        { }
 
     protected:
         /**
@@ -117,8 +122,8 @@ namespace gcn
          * You should not be able to make an instance of WidgetListener,
          * therefore its constructor is protected.
          */
-        WidgetListener() { }
-
+        WidgetListener()
+        { }
     };
 }
 
diff --git a/src/guichan/include/guichan/widgets/listbox.hpp b/src/guichan/include/guichan/widgets/listbox.hpp
index 1e73c2214..ce056acbd 100644
--- a/src/guichan/include/guichan/widgets/listbox.hpp
+++ b/src/guichan/include/guichan/widgets/listbox.hpp
@@ -89,7 +89,8 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~ListBox() { }
+        virtual ~ListBox()
+        { }
 
         /**
          * Gets the selected item as an index in the list model.
diff --git a/src/guichan/include/guichan/widgets/slider.hpp b/src/guichan/include/guichan/widgets/slider.hpp
index 77b0b8806..a22c36844 100644
--- a/src/guichan/include/guichan/widgets/slider.hpp
+++ b/src/guichan/include/guichan/widgets/slider.hpp
@@ -94,7 +94,8 @@ namespace gcn
         /**
          * Destructor.
          */
-        virtual ~Slider() { }
+        virtual ~Slider()
+        { }
 
         /**
          * Sets the scale of the slider.
diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp
index c8cec6370..ae61a0432 100644
--- a/src/guichan/sdl/sdlgraphics.cpp
+++ b/src/guichan/sdl/sdlgraphics.cpp
@@ -283,7 +283,8 @@ namespace gcn
 
         SDL_LockSurface(mTarget);
 
-        Uint8 *p = (Uint8 *)mTarget->pixels + y * mTarget->pitch + x1 * bpp;
+        Uint8 *p = static_cast<Uint8*>(mTarget->pixels)
+            + y * mTarget->pitch + x1 * bpp;
 
         Uint32 pixel = SDL_MapRGB(mTarget->format,
                                   mColor.r,
@@ -298,7 +299,7 @@ namespace gcn
 
             case 2:
             {
-                Uint16* q = (Uint16*)p;
+                Uint16* q = reinterpret_cast<Uint16*>(p);
                 for (; x1 <= x2; ++x1)
                     *(q++) = pixel;
                 break;
@@ -329,7 +330,7 @@ namespace gcn
 
             case 4:
             {
-                Uint32* q = (Uint32*)p;
+                Uint32 *q = reinterpret_cast<Uint32*>(p);
                 for (; x1 <= x2; ++x1)
                 {
                     if (mAlpha)
@@ -395,7 +396,8 @@ namespace gcn
 
         SDL_LockSurface(mTarget);
 
-        Uint8 *p = (Uint8 *)mTarget->pixels + y1 * mTarget->pitch + x * bpp;
+        Uint8 *p = static_cast<Uint8*>(mTarget->pixels)
+            + y1 * mTarget->pitch + x * bpp;
 
         Uint32 pixel = SDL_MapRGB(mTarget->format, mColor.r,
             mColor.g, mColor.b);
@@ -411,9 +413,9 @@ namespace gcn
                 break;
 
             case 2:
-                for (; y1 <= y2; ++y1)
+                for (; y1 <= y2; ++ y1)
                 {
-                    *(Uint16*)p = pixel;
+                    *reinterpret_cast<Uint16*>(p) = pixel;
                     p += mTarget->pitch;
                 }
                 break;
@@ -445,9 +447,14 @@ namespace gcn
                 for (; y1 <= y2; ++y1)
                 {
                     if (mAlpha)
-                        *(Uint32*)p = SDLAlpha32(pixel, *(Uint32*)p, mColor.a);
+                    {
+                        *reinterpret_cast<Uint32*>(p) = SDLAlpha32(pixel,
+                            *reinterpret_cast<Uint32*>(p), mColor.a);
+                    }
                     else
-                        *(Uint32*)p = pixel;
+                    {
+                        *reinterpret_cast<Uint32*>(p) = pixel;
+                    }
                     p += mTarget->pitch;
                 }
                 break;
diff --git a/src/guichan/sdl/sdlimage.cpp b/src/guichan/sdl/sdlimage.cpp
index e4aadc465..cf8505c4e 100644
--- a/src/guichan/sdl/sdlimage.cpp
+++ b/src/guichan/sdl/sdlimage.cpp
@@ -130,8 +130,8 @@ namespace gcn
 
         for (i = 0; i < mSurface->w * mSurface->h; ++i)
         {
-            if (((unsigned int*)mSurface->pixels)[i] == SDL_MapRGB(
-                mSurface->format, 255, 0, 255))
+            if ((static_cast<unsigned int*>(mSurface->pixels))[i]
+                == SDL_MapRGB(mSurface->format, 255, 0, 255))
             {
                 hasPink = true;
                 break;
@@ -142,8 +142,8 @@ namespace gcn
         {
             Uint8 r, g, b, a;
 
-            SDL_GetRGBA(((unsigned int*)mSurface->pixels)[i], mSurface->format,
-                        &r, &g, &b, &a);
+            SDL_GetRGBA((static_cast<unsigned int*>(mSurface->pixels)[i]),
+                mSurface->format, &r, &g, &b, &a);
 
             if (a != 255)
             {
diff --git a/src/guichan/widgets/scrollarea.cpp b/src/guichan/widgets/scrollarea.cpp
index 451288c77..21f7b5930 100644
--- a/src/guichan/widgets/scrollarea.cpp
+++ b/src/guichan/widgets/scrollarea.cpp
@@ -325,12 +325,12 @@ namespace gcn
             if (y < getVerticalMarkerDimension().y)
             {
                 setVerticalScrollAmount(getVerticalScrollAmount()
-                    - (int)(getChildrenArea().height * 0.95));
+                    - static_cast<int>(getChildrenArea().height * 0.95));
             }
             else
             {
                 setVerticalScrollAmount(getVerticalScrollAmount()
-                    + (int)(getChildrenArea().height * 0.95));
+                    + static_cast<int>(getChildrenArea().height * 0.95));
             }
         }
         else if (getHorizontalMarkerDimension().isPointInRect(x, y))
@@ -345,12 +345,12 @@ namespace gcn
             if (x < getHorizontalMarkerDimension().x)
             {
                 setHorizontalScrollAmount(getHorizontalScrollAmount()
-                    - (int)(getChildrenArea().width * 0.95));
+                    - static_cast<int>(getChildrenArea().width * 0.95));
             }
             else
             {
                 setHorizontalScrollAmount(getHorizontalScrollAmount()
-                    + (int)(getChildrenArea().width * 0.95));
+                    + static_cast<int>(getChildrenArea().width * 0.95));
             }
         }
     }
diff --git a/src/guichan/widgets/slider.cpp b/src/guichan/widgets/slider.cpp
index 16f7cd8be..36f067eab 100644
--- a/src/guichan/widgets/slider.cpp
+++ b/src/guichan/widgets/slider.cpp
@@ -245,7 +245,7 @@ namespace gcn
         else
             w = getHeight();
 
-        double pos = v / ((double)w - getMarkerLength());
+        double pos = v / (static_cast<double>(w) - getMarkerLength());
         return (1.0 - pos) * getScaleStart() + pos * getScaleEnd();
     }
 
@@ -257,7 +257,7 @@ namespace gcn
         else
             v = getHeight();
 
-        int w = (int)((v - getMarkerLength())
+        int w = static_cast<int>((v - getMarkerLength())
                 * (value  - getScaleStart())
                 / (getScaleEnd() - getScaleStart()));
 
diff --git a/src/guichan/widgets/tabbedarea.cpp b/src/guichan/widgets/tabbedarea.cpp
index 7af00c4c4..3e7178548 100644
--- a/src/guichan/widgets/tabbedarea.cpp
+++ b/src/guichan/widgets/tabbedarea.cpp
@@ -320,7 +320,7 @@ namespace gcn
             int index = getSelectedTabIndex();
             index++;
 
-            if (index >= (int)mTabs.size())
+            if (index >= static_cast<int>(mTabs.size()))
                 return;
             else
                 setSelectedTab(mTabs[index].first);
diff --git a/src/guichan/widgets/textbox.cpp b/src/guichan/widgets/textbox.cpp
index e78ea91a3..c2cd5586f 100644
--- a/src/guichan/widgets/textbox.cpp
+++ b/src/guichan/widgets/textbox.cpp
@@ -155,7 +155,7 @@ namespace gcn
         {
             mCaretRow = mouseEvent.getY() / getFont()->getHeight();
 
-            if (mCaretRow >= (int)mTextRows.size())
+            if (mCaretRow >= static_cast<int>(mTextRows.size()))
                 mCaretRow = mTextRows.size() - 1;
 
             mCaretColumn = getFont()->getStringIndexAt(
@@ -193,11 +193,11 @@ namespace gcn
         else if (key.getValue() == Key::RIGHT)
         {
             ++mCaretColumn;
-            if (mCaretColumn > (int)mTextRows[mCaretRow].size())
+            if (mCaretColumn > static_cast<int>(mTextRows[mCaretRow].size()))
             {
-                ++mCaretRow;
+                ++ mCaretRow;
 
-                if (mCaretRow >= (int)mTextRows.size())
+                if (mCaretRow >= static_cast<int>(mTextRows.size()))
                 {
                     mCaretRow = mTextRows.size() - 1;
                     if (mCaretRow < 0)
@@ -254,14 +254,15 @@ namespace gcn
             --mCaretRow;
         }
         else if (key.getValue() == Key::DELETE
-                 && mCaretColumn < (int)mTextRows[mCaretRow].size()
-                 && mEditable)
+                 && mCaretColumn < static_cast<int>(
+                 mTextRows[mCaretRow].size()) && mEditable)
         {
             mTextRows[mCaretRow].erase(mCaretColumn, 1);
         }
         else if (key.getValue() == Key::DELETE
-                 && mCaretColumn == (int)mTextRows[mCaretRow].size()
-                 && mCaretRow < ((int)mTextRows.size() - 1)
+                 && mCaretColumn == static_cast<int>(
+                 mTextRows[mCaretRow].size())
+                 && mCaretRow < (static_cast<int>(mTextRows.size()) - 1)
                  && mEditable)
         {
             mTextRows[mCaretRow] += mTextRows[mCaretRow + 1];
@@ -291,7 +292,7 @@ namespace gcn
                     / getFont()->getHeight();
                 mCaretRow += rowsPerPage;
 
-                if (mCaretRow >= (int)mTextRows.size())
+                if (mCaretRow >= static_cast<int>(mTextRows.size()))
                     mCaretRow = mTextRows.size() - 1;
             }
         }
@@ -305,7 +306,7 @@ namespace gcn
                  && mEditable)
         {
             mTextRows[mCaretRow].insert(mCaretColumn,
-                std::string(1, (char)key.getValue()));
+                std::string(1, static_cast<char>(key.getValue())));
             ++ mCaretColumn;
         }
 
@@ -332,9 +333,7 @@ namespace gcn
 
     void TextBox::setCaretPosition(unsigned int position)
     {
-        int row;
-
-        for (row = 0; row < (int)mTextRows.size(); row++)
+        for (int row = 0; row < static_cast<int>(mTextRows.size()); row ++)
         {
             if (position <= mTextRows[row].size())
             {
@@ -373,7 +372,7 @@ namespace gcn
     {
         mCaretRow = row;
 
-        if (mCaretRow >= (int)mTextRows.size())
+        if (mCaretRow >= static_cast<int>(mTextRows.size()))
             mCaretRow = mTextRows.size() - 1;
 
         if (mCaretRow < 0)
@@ -391,7 +390,7 @@ namespace gcn
     {
         mCaretColumn = column;
 
-        if (mCaretColumn > (int)mTextRows[mCaretRow].size())
+        if (mCaretColumn > static_cast<int>(mTextRows[mCaretRow].size()))
             mCaretColumn = mTextRows[mCaretRow].size();
 
         if (mCaretColumn < 0)
@@ -431,7 +430,7 @@ namespace gcn
         int i;
         std::string text;
 
-        for (i = 0; i < (int)mTextRows.size() - 1; ++i)
+        for (i = 0; i < static_cast<int>(mTextRows.size()) - 1; ++ i)
             text = text + mTextRows[i] + "\n";
 
         text = text + mTextRows[i];
diff --git a/src/guichan/widgets/window.cpp b/src/guichan/widgets/window.cpp
index d7c5809e6..c7ed8a69e 100644
--- a/src/guichan/widgets/window.cpp
+++ b/src/guichan/widgets/window.cpp
@@ -137,7 +137,7 @@ namespace gcn
         mDragOffsetX = mouseEvent.getX();
         mDragOffsetY = mouseEvent.getY();
 
-        mMoved = mouseEvent.getY() <= (int)mTitleBarHeight;
+        mMoved = mouseEvent.getY() <= static_cast<int>(mTitleBarHeight);
     }
 
     void Window::mouseReleased(MouseEvent& mouseEvent A_UNUSED)
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
index 9dc9d7b73..08af3b2c7 100644
--- a/src/guildmanager.cpp
+++ b/src/guildmanager.cpp
@@ -274,7 +274,7 @@ bool GuildManager::process(std::string msg)
             return false;
 //        logger->log("welcome message: %s", msg.c_str());
         int pos = msg.find("! (");
-        if (pos == (int)std::string::npos)
+        if (pos == static_cast<int>(std::string::npos))
             return false;
         msg = msg.substr(0, pos);
         guild->setName(msg);
@@ -299,7 +299,7 @@ bool GuildManager::process(std::string msg)
             return false;
 
         pos = msg.find(", Guild:");
-        if (pos == (int)std::string::npos)
+        if (pos == static_cast<int>(std::string::npos))
             return false;
 
         int level = atoi(msg.substr(0, pos).c_str());
@@ -310,7 +310,7 @@ bool GuildManager::process(std::string msg)
 
         msg = msg.substr(pos + strlen(", Guild:"));
         pos = msg.find(", No. Of Online Players: ");
-        if (pos == (int)std::string::npos)
+        if (pos == static_cast<int>(std::string::npos))
             return false;
 
         msg = msg.substr(0, pos);
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index ea04a0e89..fc676dab0 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -1,6 +1,8 @@
 /*
  *  Custom keyboard shortcuts configuration
  *  Copyright (C) 2007  Joshua Langley <joshlangley@optusnet.com.au>
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index 1610c1ecd..1c91159ac 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -1,6 +1,8 @@
 /*
  *  Custom keyboard shortcuts configuration
  *  Copyright (C) 2007  Joshua Langley <joshlangley@optusnet.com.au>
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 0576c8ddb..1acc6a938 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -205,17 +205,8 @@ LocalPlayer::~LocalPlayer()
 {
     logger->log1("LocalPlayer::~LocalPlayer");
 
-    config.removeListener("showownname", this);
-    config.removeListener("targetDeadPlayers", this);
+    config.removeListeners(this);
     serverConfig.removeListener("enableBuggyServers", this);
-    config.removeListener("syncPlayerMove", this);
-    config.removeListener("drawPath", this);
-    config.removeListener("serverAttack", this);
-    config.removeListener("attackMoving", this);
-    config.removeListener("showJobExp", this);
-    config.removeListener("enableAdvert", this);
-    config.removeListener("tradebot", this);
-    config.removeListener("targetOnlyReachable", this);
 
     delete mAwayDialog;
     mAwayDialog = nullptr;
@@ -1677,7 +1668,7 @@ void LocalPlayer::processEvent(Channels channel,
                                  - event.getInt("oldValue");
 
                     if (change != 0)
-                        addMessageToQueue(toString(change) + " xp");
+                        addMessageToQueue(strprintf("%d %s", change, _("xp")));
                     break;
                 }
                 case LEVEL:
@@ -1711,7 +1702,8 @@ void LocalPlayer::processEvent(Channels channel,
                         MessagePair pair = mMessages.back();
                         // TRANSLATORS: this is normal experience
                         if (pair.first.find(strprintf(" %s",
-                            _("xp"))) == pair.first.size() - 3)
+                            _("xp"))) == pair.first.size()
+                            - strlen(_("xp")) - 1)
                         {
                             mMessages.pop_back();
                             // TRANSLATORS: this is job experience
@@ -2063,7 +2055,7 @@ std::string LocalPlayer::getQuickDropCounterString()
 
 void LocalPlayer::setQuickDropCounter(int n)
 {
-    if (n < 1 || n >= (signed)quickDropCounterSize)
+    if (n < 1 || n >= static_cast<signed>(quickDropCounterSize))
         return;
     mQuickDropCounter = n;
     config.setValue("quickDropCounter", mQuickDropCounter);
@@ -2152,7 +2144,7 @@ static const char *pvpAttackStrings[] =
     N_("(a) attack all players"),
     N_("(f) attack all except friends"),
     N_("(b) attack bad relations"),
-    N_("(d) dont attack players"),
+    N_("(d) don't attack players"),
     N_("(?) pvp attack")
 };
 
@@ -2203,7 +2195,8 @@ void LocalPlayer::changeAwayMode()
         if (outfitWindow)
             outfitWindow->wearAwayOutfit();
         mAwayDialog = new OkDialog(_("Away"),
-            config.getStringValue("afkMessage"), true, false);
+            config.getStringValue("afkMessage"),
+            DIALOG_SILENCE, true, false);
         mAwayDialog->addActionListener(mAwayListener);
         sound.volumeOff();
     }
@@ -3168,15 +3161,11 @@ void LocalPlayer::specialMove(unsigned char direction)
         && getInvertDirection() <= 4)
         && !mIsServerBuggy)
     {
-        int max;
-        if (getInvertDirection() == 2)
-            max = 10;
-        else
-            max = 30;
-
         if (mAction == MOVE)
             return;
 
+        int max;
+
         if (getInvertDirection() == 2)
             max = 5;
         else if (getInvertDirection() == 4)
@@ -4150,7 +4139,7 @@ void LocalPlayer::checkNewName(Being *being)
     if (!mWaitFor.empty() && mWaitFor == nick)
     {
         debugMsg(_("You see ") + mWaitFor);
-        sound.playGuiSfx("system/newmessage.ogg");
+        sound.playGuiSound(SOUND_INFO);
         mWaitFor = "";
     }
 }
diff --git a/src/logger.cpp b/src/logger.cpp
index 1541616f2..9c9c6efef 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -189,7 +189,8 @@ void Logger::log(const char *log_text, ...)
     delete [] buf;
 }
 
-void Logger::error(const std::string &error_text)
+// here string must be safe for any usage
+void Logger::safeError(const std::string &error_text)
 {
     log("Error: %s", error_text.c_str());
 #ifdef WIN32
@@ -214,3 +215,31 @@ void Logger::error(const std::string &error_text)
 #endif
     exit(1);
 }
+
+// here string can be unsafe strings
+void Logger::error(const std::string &error_text)
+{
+    log("Error: %s", error_text.c_str());
+#ifdef WIN32
+    MessageBox(nullptr, error_text.c_str(), "Error", MB_ICONERROR | MB_OK);
+#elif defined __APPLE__
+//    Str255 msg;
+//    CFStringRef error;
+//    error = CFStringCreateWithCString(nullptr,
+//                                      error_text.c_str(),
+//                                      kCFStringEncodingMacRoman);
+//    CFStringGetPascalString(error, msg, 255, kCFStringEncodingMacRoman);
+//    StandardAlert(kAlertStopAlert,
+//                  (const unsigned char*)"\pError",
+//                  (ConstStr255Param) msg, nullptr, nullptr);
+#elif defined __linux__ || __linux
+    std::cerr << "Error: " << error_text << std::endl;
+    std::string msg = "xmessage \"Error happend. "
+        "Please see log file for more information.\"";
+    if (system(msg.c_str()) == -1)
+        std::cerr << "Error: " << error_text << std::endl;
+#else
+    std::cerr << "Error: " << error_text << std::endl;
+#endif
+    exit(1);
+}
diff --git a/src/logger.h b/src/logger.h
index db618b275..54b44cc0e 100644
--- a/src/logger.h
+++ b/src/logger.h
@@ -58,12 +58,14 @@ class Logger
         /**
          * Sets whether the log should be written to standard output.
          */
-        void setLogToStandardOut(bool value) { mLogToStandardOut = value; }
+        void setLogToStandardOut(bool value)
+        { mLogToStandardOut = value; }
 
         /**
          * Enables logging to chat window
          */
-        void setChatWindow(ChatWindow *window) { mChatWindow = window; }
+        void setChatWindow(ChatWindow *window)
+        { mChatWindow = window; }
 
         /**
          * Enters a message in the log. The message will be timestamped.
@@ -98,6 +100,13 @@ class Logger
          */
         void error(const std::string &error_text) __attribute__ ((noreturn));
 
+        /**
+         * Log an error and quit. The error will pop-up on Windows and Mac, and
+         * will be printed to standard error everywhere else.
+         */
+        void safeError(const std::string &error_text)
+            __attribute__ ((noreturn));
+
     private:
         std::ofstream mLogFile;
         bool mLogToStandardOut;
diff --git a/src/main.h b/src/main.h
index fbc672939..abc152ed3 100644
--- a/src/main.h
+++ b/src/main.h
@@ -45,8 +45,8 @@
  * different interfaces, which have different implementations for each server.
  */
 
-#define SMALL_VERSION "1.2.2.5"
-#define CHECK_VERSION "01.02.02.05"
+#define SMALL_VERSION "1.2.2.19"
+#define CHECK_VERSION "01.02.02.19"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
diff --git a/src/map.cpp b/src/map.cpp
index b8767e5e4..d983508b1 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -177,9 +177,7 @@ Map::Map(int width, int height, int tileWidth, int tileHeight):
 
 Map::~Map()
 {
-    config.removeListener("OverlayDetail", this);
-    config.removeListener("guialpha", this);
-    config.removeListener("beingopacity", this);
+    config.removeListeners(this);
 
     // delete metadata, layers, tilesets and overlays
     delete [] mMetaTiles;
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index bc1491ada..49ce3a01c 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -1,7 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2004  The Mana World Development Team
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -16,8 +16,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef BEINGHANDLER_H
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 2dc51acf3..67894b0d9 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -167,7 +167,7 @@ void CharServerHandler::processCharCreateFailed(Net::MessageIn &msg)
             errorMessage = _("Incorrect race.");
             break;
     }
-    new OkDialog(_("Error"), errorMessage);
+    new OkDialog(_("Error"), errorMessage, DIALOG_ERROR);
     if (mCharCreateDialog)
         mCharCreateDialog->unlock();
 }
@@ -185,7 +185,7 @@ void CharServerHandler::processCharDelete(Net::MessageIn &msg A_UNUSED)
 void CharServerHandler::processCharDeleteFailed(Net::MessageIn &msg A_UNUSED)
 {
     unlockCharSelectDialog();
-    new OkDialog(_("Error"), _("Failed to delete character."));
+    new OkDialog(_("Error"), _("Failed to delete character."), DIALOG_ERROR);
 }
 
 void CharServerHandler::clear()
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 6d021d6a9..c8c870dbd 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -101,7 +101,7 @@ void GameHandler::processCharSwitchResponse(Net::MessageIn &msg)
 void GameHandler::processMapQuitResponse(Net::MessageIn &msg)
 {
     if (msg.readInt8())
-        new OkDialog(_("Game"), _("Request to quit denied!"), nullptr);
+        new OkDialog(_("Game"), _("Request to quit denied!"), DIALOG_ERROR);
 }
 
 } // namespace Ea
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 87fc34d94..bd1521b21 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -26,6 +26,7 @@
 #include "commandhandler.h"
 #include "guild.h"
 #include "localplayer.h"
+#include "sound.h"
 
 #include "gui/theme.h"
 
@@ -151,4 +152,9 @@ void GuildTab::saveToLogFile(std::string &msg)
         chatLogger->log("#Guild", msg);
 }
 
+void GuildTab::playNewMessageSound()
+{
+    sound.playGuiSound(SOUND_GUILD);
+}
+
 } // namespace Ea
diff --git a/src/net/ea/gui/guildtab.h b/src/net/ea/gui/guildtab.h
index 81d971161..22a41ce80 100644
--- a/src/net/ea/gui/guildtab.h
+++ b/src/net/ea/gui/guildtab.h
@@ -47,6 +47,8 @@ class GuildTab : public ChatTab
         int getType() const
         { return ChatTab::TAB_GUILD; }
 
+        void playNewMessageSound();
+
     protected:
         void handleInput(const std::string &msg);
 
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index d5e344ac2..e69207842 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -26,6 +26,7 @@
 #include "commandhandler.h"
 #include "localplayer.h"
 #include "party.h"
+#include "sound.h"
 
 #include "gui/theme.h"
 
@@ -241,4 +242,8 @@ void PartyTab::saveToLogFile(std::string &msg)
         chatLogger->log("#Party", msg);
 }
 
+void PartyTab::playNewMessageSound()
+{
+    sound.playGuiSound(SOUND_GUILD);
+}
 } // namespace Ea
diff --git a/src/net/ea/gui/partytab.h b/src/net/ea/gui/partytab.h
index 029d71ac7..931b283dd 100644
--- a/src/net/ea/gui/partytab.h
+++ b/src/net/ea/gui/partytab.h
@@ -47,6 +47,8 @@ class PartyTab : public ChatTab
 
         void saveToLogFile(std::string &msg);
 
+        void playNewMessageSound();
+
     protected:
         void handleInput(const std::string &msg);
 
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 556e72c8d..68d712db1 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -1,6 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 596fda4f7..f08930e8c 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -1,6 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 27aa4da80..bfbef0798 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -28,6 +28,7 @@
 #include "playerinfo.h"
 #include "units.h"
 
+#include "gui/ministatuswindow.h"
 #include "gui/okdialog.h"
 #include "gui/skilldialog.h"
 #include "gui/statuswindow.h"
@@ -257,7 +258,12 @@ void PlayerHandler::processPlayerWarp(Net::MessageIn &msg)
         static_cast<int>(scrollOffsetY));
 
     if (viewport)
+    {
+        viewport->returnCamera();
+        if (miniStatusWindow)
+            miniStatusWindow->updateStatus();
         viewport->scrollBy(scrollOffsetX, scrollOffsetY);
+    }
 }
 
 void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
@@ -336,7 +342,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
                     weightNotice = new OkDialog(_("Message"),
                         _("You are carrying more than "
                         "half your weight. You are "
-                        "unable to regain health."), false);
+                        "unable to regain health."), DIALOG_OK, false);
                     weightNotice->addActionListener(
                         &weightListener);
                 }
@@ -346,7 +352,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
                     weightNotice = new OkDialog(_("Message"),
                         _("You are carrying less than "
                         "half your weight. You "
-                        "can regain health."), false);
+                        "can regain health."), DIALOG_OK, false);
                     weightNotice->addActionListener(
                         &weightListener);
                 }
@@ -426,8 +432,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
     if (PlayerInfo::getAttribute(HP) == 0 && !deathNotice)
     {
         deathNotice = new OkDialog(_("Message"),
-                                    randomDeathMessage(),
-                                    false);
+            randomDeathMessage(), DIALOG_OK, false);
         deathNotice->addActionListener(&deathListener);
         player_node->setAction(Being::DEAD);
     }
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index cef4f497a..9468baaa1 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -335,7 +335,8 @@ void BeingHandler::handleBeingActionChangeMessage(Net::MessageIn &msg)
         };
         std::string message(deadMsg[rand() % 13]);
         message.append(std::string(" ") + _("Press OK to respawn."));
-        OkDialog *dlg = new OkDialog(_("You Died"), message, false);
+        OkDialog *dlg = new OkDialog(_("You Died"),
+            message, DIALOG_OK, false);
         dlg->addActionListener(&(ManaServ::respawnListener));
     }
 }
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index 300af5a2b..7977df909 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -181,7 +181,7 @@ void CharHandler::handleCharacterCreateResponse(Net::MessageIn &msg)
                 errorMessage = _("Unknown error.");
                 break;
         }
-        new OkDialog(_("Error"), errorMessage);
+        new OkDialog(_("Error"), errorMessage, DIALOG_ERROR);
 
         if (mCharCreateDialog)
             mCharCreateDialog->unlock();
@@ -224,7 +224,7 @@ void CharHandler::handleCharacterDeleteResponse(Net::MessageIn &msg)
             default:
                 errorMessage = strprintf(_("Unknown error (%d)."), errMsg);
         }
-        new OkDialog(_("Error"), errorMessage);
+        new OkDialog(_("Error"), errorMessage, DIALOG_ERROR);
     }
     mSelectedCharacter = 0;
     unlockCharSelectDialog();
diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h
index 83e636e0e..2019755ea 100644
--- a/src/net/manaserv/gamehandler.h
+++ b/src/net/manaserv/gamehandler.h
@@ -48,7 +48,8 @@ class GameHandler : public MessageHandler, public Net::GameHandler
 
         void quit(bool reconnectAccount);
 
-        void quit() { quit(false); }
+        void quit()
+        { quit(false); }
 
         void ping(int tick);
 
diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp
index 84e71eaf3..05041c56a 100644
--- a/src/net/manaserv/network.cpp
+++ b/src/net/manaserv/network.cpp
@@ -54,7 +54,7 @@ void initialize()
 {
     if (enet_initialize())
     {
-        logger->error("Failed to initialize ENet.");
+        logger->safeError("Failed to initialize ENet.");
     }
 
 #if defined(ENET_VERSION) && ENET_VERSION >= ENET_CUTOFF
@@ -65,7 +65,7 @@ void initialize()
 
     if (!client)
     {
-        logger->error("Failed to create the local host.");
+        logger->safeError("Failed to create the local host.");
     }
 }
 
@@ -76,8 +76,8 @@ void finalize()
 
     if (connections)
     {
-        logger->error("Tried to shutdown the network subsystem while there "
-                "are network connections left!");
+        logger->safeError("Tried to shutdown the network subsystem "
+            "while there are network connections left!");
     }
 
     clearNetworkHandlers();
@@ -88,7 +88,7 @@ Connection *getConnection()
 {
     if (!client)
     {
-        logger->error("Tried to instantiate a network object before "
+        logger->safeError("Tried to instantiate a network object before "
                 "initializing the network subsystem!");
     }
 
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 0547ed337..5d15d26ac 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -265,7 +265,7 @@ unsigned char *MessageIn::readBytes(int length)
 #ifdef ENABLEDEBUGLOG
     std::string str;
     for (int f = 0; f < length; f ++)
-        str += strprintf ("%02x", (unsigned)buf[f]);
+        str += strprintf ("%02x", static_cast<unsigned>(buf[f]));
     str += " ";
     for (int f = 0; f < length; f ++)
     {
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 6e9e367c0..b8ba7554e 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -236,7 +236,7 @@ void Network::dispatchMessages()
         MessageHandlerIterator iter = mMessageHandlers.find(msg.getId());
 
         if (msg.getLength() == 0)
-            logger->error("Zero length packet received. Exiting.");
+            logger->safeError("Zero length packet received. Exiting.");
 
         if (iter != mMessageHandlers.end())
         {
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 7f942a206..b8f3a07e1 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -1,6 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 4d727a986..eb3f68a70 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -1,6 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2008  Lloyd Bryant <lloyd_bryant@netzero.net>
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index bfe9eea42..a63af770a 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -229,7 +229,7 @@ void PlayerHandler::processOnlineList(Net::MessageIn &msg)
         return;
     }
 
-    char *start = (char*)msg.readBytes(size);
+    char *start = reinterpret_cast<char*>(msg.readBytes(size));
     if (!start)
         return;
 
@@ -265,7 +265,7 @@ void PlayerHandler::processOnlineList(Net::MessageIn &msg)
                     gender = GENDER_FEMALE;
             }
         }
-        arr.push_back(new OnlinePlayer((char*)buf,
+        arr.push_back(new OnlinePlayer(static_cast<char*>(buf),
             status, level, gender, ver));
         buf += strlen(buf) + 1;
     }
diff --git a/src/opengl1graphics.cpp b/src/opengl1graphics.cpp
index 34e9fcda3..ea4d5e6f3 100644
--- a/src/opengl1graphics.cpp
+++ b/src/opengl1graphics.cpp
@@ -393,8 +393,10 @@ void OpenGL1Graphics::drawRescaledImagePattern(Image *image, int x, int y,
     // Draw a set of textured rectangles
     glBegin(GL_QUADS);
 
-    const float scaleFactorW = (float) scaledWidth / image->getWidth();
-    const float scaleFactorH = (float) scaledHeight / image->getHeight();
+    const float scaleFactorW = static_cast<float>(scaledWidth)
+        / image->getWidth();
+    const float scaleFactorH = static_cast<float>(scaledHeight)
+        / image->getHeight();
 
     for (int py = 0; py < h; py += ih)
     {
diff --git a/src/opengl1graphics.h b/src/opengl1graphics.h
index 76dc3ef00..8cc3c89a7 100644
--- a/src/opengl1graphics.h
+++ b/src/opengl1graphics.h
@@ -23,15 +23,14 @@
 #ifndef OPENGL1GRAPHICS_H
 #define OPENGL1GRAPHICS_H
 
+#ifdef USE_OPENGL
 #include "main.h"
 
 #include "graphics.h"
 
-#ifdef USE_OPENGL
 #define NO_SDL_GLEXT
 
 #include <SDL_opengl.h>
-#endif
 
 class OpenGL1Graphics : public Graphics
 {
@@ -140,5 +139,6 @@ class OpenGL1Graphics : public Graphics
         bool mColorAlpha;
         bool mSync;
 };
+#endif
 
 #endif
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index bcf46e18b..d972a738f 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -554,8 +554,10 @@ void OpenGLGraphics::drawRescaledImagePattern(Image *image,
             {
                 int width = (px + scaledWidth >= w) ? w - px : scaledWidth;
                 int dstX = x + px;
-                const float visibleFractionW = (float) width / scaledWidth;
-                const float visibleFractionH = (float) height / scaledHeight;
+                const float visibleFractionW = static_cast<float>(width)
+                    / scaledWidth;
+                const float visibleFractionH = static_cast<float>(height)
+                    / scaledHeight;
 
                 const float texX2 = texX1 + tFractionW * visibleFractionW;
                 const float texY2 = texY1 + tFractionH * visibleFractionH;
@@ -597,8 +599,8 @@ void OpenGLGraphics::drawRescaledImagePattern(Image *image,
     }
     else
     {
-        const float scaleFactorW = (float) scaledWidth / iw;
-        const float scaleFactorH = (float) scaledHeight / ih;
+        const float scaleFactorW = static_cast<float>(scaledWidth) / iw;
+        const float scaleFactorH = static_cast<float>(scaledHeight) / ih;
 
         for (int py = 0; py < h; py += scaledHeight)
         {
diff --git a/src/openglgraphics.h b/src/openglgraphics.h
index f3bdc4470..9eeb530ac 100644
--- a/src/openglgraphics.h
+++ b/src/openglgraphics.h
@@ -23,15 +23,14 @@
 #ifndef OPENGLGRAPHICS_H
 #define OPENGLGRAPHICS_H
 
-#include "main.h"
+#ifdef USE_OPENGL
 
+#include "main.h"
 #include "graphics.h"
 
-#ifdef USE_OPENGL
 #define NO_SDL_GLEXT
 
 #include <SDL_opengl.h>
-#endif
 
 class OpenGLGraphics : public Graphics
 {
@@ -154,5 +153,6 @@ class OpenGLGraphics : public Graphics
         bool mColorAlpha;
         bool mSync;
 };
+#endif
 
 #endif
diff --git a/src/particlecontainer.h b/src/particlecontainer.h
index a8af163fd..4e402044b 100644
--- a/src/particlecontainer.h
+++ b/src/particlecontainer.h
@@ -57,7 +57,8 @@ public:
     /**
      * Kills and removes all particle effects (only in this container)
      */
-    virtual void clearLocally() {}
+    virtual void clearLocally()
+    { }
 
     /**
      * Sets the positions of all elements
diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h
index cadfa0f3a..2b6b7ba1a 100644
--- a/src/particleemitterprop.h
+++ b/src/particleemitterprop.h
@@ -21,6 +21,7 @@
  */
 
 #include <cmath>
+#include <cstdlib>
 
 /**
  * Returns a random numeric value that is larger than or equal min and smaller
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index e1f88ecb7..6c799cdfa 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -69,3 +69,16 @@ void Action::setAnimation(int direction, Animation *animation)
 {
     mAnimations[direction] = animation;
 }
+
+void Action::setLastFrameDelay(int delay)
+{
+    AnimationIter it = mAnimations.begin();
+    AnimationIter it_end = mAnimations.end();
+    for (; it != it_end; ++ it)
+    {
+        Animation *animation = (*it).second;
+        if (!animation)
+            continue;
+        animation->setLastFrameDelay(delay);
+    }
+}
diff --git a/src/resources/action.h b/src/resources/action.h
index 3951cc02c..f9c5da75b 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -29,6 +29,7 @@
 
 class Animation;
 
+
 /**
  * An action consists of several animations, one for each direction.
  */
@@ -49,9 +50,12 @@ class Action
         void setNumber(unsigned n)
         { mNumber = n; }
 
+        void setLastFrameDelay(int delay);
+
     protected:
         typedef std::map<int, Animation*> Animations;
-        typedef Animations::iterator AnimationIterator;
+        typedef Animations::iterator AnimationIter;
+
         Animations mAnimations;
         unsigned mNumber;
 };
diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index 1c1da6ca5..388c1301e 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -69,3 +69,17 @@ void Animation::addGoto(std::string name, int rand)
     Frame frame = { nullptr, 0, 0, 0, rand, Frame::GOTO, name };
     mFrames.push_back(frame);
 }
+
+void Animation::setLastFrameDelay(int delay)
+{
+    FramesRevIter it = mFrames.rbegin();
+    FramesRevIter it_end = mFrames.rend();
+    for (; it != it_end; ++ it)
+    {
+        if ((*it).type == Frame::ANIMATION && (*it).image)
+        {
+            (*it).delay = delay;
+            break;
+        }
+    }
+}
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 33bfd76e9..53e9adbea 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -102,13 +102,19 @@ class Animation
 
         void addGoto(std::string name, int rand);
 
+        void setLastFrameDelay(int delay);
+
         /**
          * Determines whether the given animation frame is a terminator.
          */
         static bool isTerminator(const Frame &phase);
 
     protected:
-        std::vector<Frame> mFrames;
+        typedef std::vector<Frame> Frames;
+        typedef Frames::iterator FramesIter;
+        typedef Frames::reverse_iterator FramesRevIter;
+
+        Frames mFrames;
         int mDuration;
 };
 
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index 6800c5170..eec5916c4 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -309,7 +309,7 @@ void Dye::instantiate(std::string &target, const std::string &palettes)
             {
                 s << palettes.substr(pal_pos);
                 s << target.substr(next_pos);
-                pal_pos = std::string::npos;
+                //pal_pos = std::string::npos;
                 break;
             }
             s << palettes.substr(pal_pos, pal_next_pos - pal_pos);
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index d6c01af6d..4fe036528 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -1,6 +1,7 @@
 /*
  *  Emote database
  *  Copyright (C) 2009  Aethyra Development Team
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 94d97a872..f739b1ed0 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -1,6 +1,7 @@
 /*
  *  Emote database
  *  Copyright (C) 2009  Aethyra Development Team
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index 0ac11f114..1e2bd6b51 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -885,10 +885,20 @@ SubImage::SubImage(Image *parent, SDL_Surface *image,
     mBounds.y = static_cast<short>(y);
     mBounds.w = static_cast<Uint16>(width);
     mBounds.h = static_cast<Uint16>(height);
-    mInternalBounds.x = mParent->mBounds.x;
-    mInternalBounds.y = mParent->mBounds.y;
-    mInternalBounds.w = mParent->mBounds.w;
-    mInternalBounds.h = mParent->mBounds.h;
+    if (mParent)
+    {
+        mInternalBounds.x = mParent->mBounds.x;
+        mInternalBounds.y = mParent->mBounds.y;
+        mInternalBounds.w = mParent->mBounds.w;
+        mInternalBounds.h = mParent->mBounds.h;
+    }
+    else
+    {
+        mInternalBounds.x = 0;
+        mInternalBounds.y = 0;
+        mInternalBounds.w = 1;
+        mInternalBounds.h = 1;
+    }
     mUseAlphaCache = false;
 }
 
diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp
index 664d2c73d..50ea773bc 100644
--- a/src/resources/specialdb.cpp
+++ b/src/resources/specialdb.cpp
@@ -129,5 +129,4 @@ SpecialInfo *SpecialDB::get(int id)
         return nullptr;
     else
         return i->second;
-    return nullptr;
 }
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 0d9b95f6f..02b46f1cf 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -36,6 +36,7 @@
 #include "debug.h"
 
 SpriteReference *SpriteReference::Empty = nullptr;
+extern int serverVersion;
 
 Action *SpriteDef::getAction(std::string action, unsigned num) const
 {
@@ -99,13 +100,30 @@ SpriteDef *SpriteDef::load(const std::string &animationFile, int variant)
     def->mProcessedFiles.insert(animationFile);
     def->loadSprite(rootNode, variant, palettes);
     def->substituteActions();
+    if (serverVersion < 1)
+        def->fixDeadAction();
     return def;
 }
 
+void SpriteDef::fixDeadAction()
+{
+    ActionsIter it = mActions.begin();
+    ActionsIter it_end = mActions.end();
+    for (; it != it_end; ++ it)
+    {
+        ActionMap *d = (*it).second;
+        if (!d)
+            continue;
+        ActionMap::iterator i = d->find("dead");
+        if (i != d->end() && i->second)
+            (i->second)->setLastFrameDelay(0);
+    }
+}
+
 void SpriteDef::substituteAction(std::string complete, std::string with)
 {
-    Actions::const_iterator it = mActions.begin();
-    Actions::const_iterator it_end = mActions.end();
+    ActionsConstIter it = mActions.begin();
+    ActionsConstIter it_end = mActions.end();
     for (; it != it_end; ++ it)
     {
         ActionMap *d = (*it).second;
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index 0490bdcb3..e167cf188 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -176,6 +176,11 @@ class SpriteDef : public Resource
         void substituteActions();
 
         /**
+         * Fix bad timeout in last dead action frame
+         */
+        void fixDeadAction();
+
+        /**
          * When there are no animations defined for the action "complete", its
          * animations become a copy of those of the action "with".
          */
@@ -185,6 +190,8 @@ class SpriteDef : public Resource
         typedef ImageSets::iterator ImageSetIterator;
         typedef std::map<std::string, Action*> ActionMap;
         typedef std::map<unsigned, ActionMap*> Actions;
+        typedef Actions::const_iterator ActionsConstIter;
+        typedef Actions::iterator ActionsIter;
 
         ImageSets mImageSets;
         Actions mActions;
diff --git a/src/sound.cpp b/src/sound.cpp
index 913b55656..5b7f1201d 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -66,9 +66,7 @@ Sound::Sound():
 
 Sound::~Sound()
 {
-    config.removeListener("playBattleSound", this);
-    config.removeListener("playGuiSound", this);
-    config.removeListener("playMusic", this);
+    config.removeListeners(this);
 
     // Unlink the callback function.
     Mix_HookMusicFinished(nullptr);
@@ -82,6 +80,10 @@ void Sound::optionChanged(const std::string &value)
         mPlayGui = config.getBoolValue("playGuiSound");
     else if (value == "playMusic")
         mPlayMusic = config.getBoolValue("playMusic");
+    else if (value == "sfxVolume")
+        setSfxVolume(config.getIntValue("sfxVolume"));
+    else if (value == "musicVolume")
+        setMusicVolume(config.getIntValue("musicVolume"));
 }
 
 void Sound::init()
@@ -98,6 +100,8 @@ void Sound::init()
     config.addListener("playBattleSound", this);
     config.addListener("playGuiSound", this);
     config.addListener("playMusic", this);
+    config.addListener("sfxVolume", this);
+    config.addListener("musicVolume", this);
 
     if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1)
     {
@@ -317,6 +321,12 @@ void Sound::playSfx(const std::string &path, int x, int y)
     }
 }
 
+void Sound::playGuiSound(const std::string &name)
+{
+    playGuiSfx(branding.getStringValue("systemsounds")
+        + config.getStringValue(name) + ".ogg");
+}
+
 void Sound::playGuiSfx(const std::string &path)
 {
     if (!mInstalled || path.empty() || !mPlayGui)
diff --git a/src/sound.h b/src/sound.h
index 7f9fb64a4..a967d0a92 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -31,6 +31,15 @@
 
 class Music;
 
+const static std::string SOUND_INFO = "soundinfo";
+const static std::string SOUND_ERROR = "sounderror";
+const static std::string SOUND_REQUEST = "soundrequest";
+const static std::string SOUND_TRADE = "soundtrade";
+const static std::string SOUND_WHISPER = "soundwhisper";
+const static std::string SOUND_HIGHLIGHT = "soundhighlight";
+const static std::string SOUND_GLOBAL = "soundglobal";
+const static std::string SOUND_GUILD = "soundguild";
+
 /** Sound engine
  *
  * \ingroup CORE
@@ -109,6 +118,8 @@ class Sound : public ConfigListener
          */
         void playGuiSfx(const std::string &path);
 
+        void playGuiSound(const std::string &name);
+
         void changeAudio();
 
         void volumeOff();
diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp
index ebdff6382..1e4c43f1f 100644
--- a/src/spellmanager.cpp
+++ b/src/spellmanager.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "spellmanager.h"
diff --git a/src/spellmanager.h b/src/spellmanager.h
index 651ada56c..ae928ee7a 100644
--- a/src/spellmanager.h
+++ b/src/spellmanager.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SPELLMANAGER_H
diff --git a/src/spellshortcut.cpp b/src/spellshortcut.cpp
index 67171524c..27ccc1646 100644
--- a/src/spellshortcut.cpp
+++ b/src/spellshortcut.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers.
+ *  Copyright (C) 2011-2012  The ManaPlus developers.
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "configuration.h"
diff --git a/src/spellshortcut.h b/src/spellshortcut.h
index 047ccdef3..f3e5611e4 100644
--- a/src/spellshortcut.h
+++ b/src/spellshortcut.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SPELLSHORTCUT_H
diff --git a/src/sprite.h b/src/sprite.h
index ffee97d49..ab2dcfc6a 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -32,7 +32,8 @@ class Image;
 class Sprite
 {
     public:
-        virtual ~Sprite() {}
+        virtual ~Sprite()
+        { }
 
         /**
          * Resets the sprite.
diff --git a/src/textcommand.cpp b/src/textcommand.cpp
index 8801ef149..ec9e97f61 100644
--- a/src/textcommand.cpp
+++ b/src/textcommand.cpp
@@ -2,6 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -16,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "textcommand.h"
diff --git a/src/textcommand.h b/src/textcommand.h
index 6677b97e9..7cab06317 100644
--- a/src/textcommand.h
+++ b/src/textcommand.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  Andrei Karas
- *  Copyright (C) 2011  ManaPlus developers
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -17,8 +17,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef TEXTCOMMAND_H
diff --git a/src/textmanager.cpp b/src/textmanager.cpp
index 6c73d00b4..3cd36e449 100644
--- a/src/textmanager.cpp
+++ b/src/textmanager.cpp
@@ -1,6 +1,7 @@
 /*
  *  Support for non-overlapping floating text
  *  Copyright (C) 2008  Douglas Boffey <DougABoffey@netscape.net>
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/textmanager.h b/src/textmanager.h
index 1ed88883a..220f30da3 100644
--- a/src/textmanager.h
+++ b/src/textmanager.h
@@ -1,6 +1,7 @@
 /*
  *  Support for non-overlapping floating text
  *  Copyright (C) 2008  Douglas Boffey <DougABoffey@netscape.net>
+ *  Copyright (C) 2011-2012  The ManaPlus developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/checkutils.cpp b/src/utils/checkutils.cpp
index 64bb42d0c..abbc6138a 100644
--- a/src/utils/checkutils.cpp
+++ b/src/utils/checkutils.cpp
@@ -24,6 +24,8 @@
 
 #include "logger.h"
 
+#include "debug.h"
+
 bool reportFalseReal(bool val, const char* file, unsigned line)
 {
     if (!val)
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index d918c8108..763b579d0 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -1,7 +1,7 @@
 /*
  *  Retrieve string pasted depending on OS mechanisms.
  *  Copyright (C) 2001-2010  Wormux Team
- *  Copyright (C) 2011  ManaPlus Developers
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -442,9 +442,15 @@ bool runxsel(std::string& text, const char *p1, const char *p2)
             close(fd[0]);
         }
         if (p2)
-            execl("/usr/bin/xsel", "xsel", p1, p2, (char *)nullptr);
+        {
+            execl("/usr/bin/xsel", "xsel", p1, p2,
+                static_cast<char *>(nullptr));
+        }
         else
-            execl("/usr/bin/xsel", "xsel", p1, (char *)nullptr);
+        {
+            execl("/usr/bin/xsel", "xsel", p1,
+                static_cast<char *>(nullptr));
+        }
 
         exit(1);
     }
diff --git a/src/utils/copynpaste.h b/src/utils/copynpaste.h
index 03596d5d1..5e95a1152 100644
--- a/src/utils/copynpaste.h
+++ b/src/utils/copynpaste.h
@@ -1,6 +1,7 @@
 /*
  *  Retrieve string pasted depending on OS mechanisms.
  *  Copyright (C) 2001-2010  Wormux Team
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/langs.cpp b/src/utils/langs.cpp
index 2efbd781a..c1f9f7ecf 100644
--- a/src/utils/langs.cpp
+++ b/src/utils/langs.cpp
@@ -44,11 +44,11 @@ std::vector<std::string> getLang()
     }
 
     int dot = lang.find(".");
-    if (dot != (signed)std::string::npos)
+    if (dot != static_cast<signed>(std::string::npos))
         lang = lang.substr(0, dot);
     langs.push_back(lang);
     dot = lang.find("_");
-    if (dot != (signed)std::string::npos)
+    if (dot != static_cast<signed>(std::string::npos))
         langs.push_back(lang.substr(0, dot));
     return langs;
 }
@@ -78,10 +78,10 @@ std::string getLangShort()
     }
 
     int dot = lang.find(".");
-    if (dot != (signed)std::string::npos)
+    if (dot != static_cast<signed>(std::string::npos))
         lang = lang.substr(0, dot);
     dot = lang.find("_");
-    if (dot != (signed)std::string::npos)
+    if (dot != static_cast<signed>(std::string::npos))
         return lang.substr(0, dot);
     return lang;
 }
diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h
index 9f6818146..6d5a8339d 100644
--- a/src/utils/mathutils.h
+++ b/src/utils/mathutils.h
@@ -23,7 +23,9 @@
 #ifndef UTILS_MATHUTILS_H
 #define UTILS_MATHUTILS_H
 
+#include <string>
 #include <stdint.h>
+#include <cstring>
 
 static uint16_t crc_table[256] =
 {
@@ -112,4 +114,9 @@ inline float weightedAverage(float n1, float n2, float w)
     return w * n2 + (1.0f - w) * n1;
 }
 
+inline int roundDouble(double v)
+{
+    return (v > 0.0) ? (v + 0.5) : (v - 0.5); 
+}
+
 #endif // UTILS_MATHUTILS_H
diff --git a/src/utils/physfsrwops.cpp b/src/utils/physfsrwops.cpp
index 1960f0dee..19b08d4c7 100644
--- a/src/utils/physfsrwops.cpp
+++ b/src/utils/physfsrwops.cpp
@@ -27,9 +27,11 @@
 
 #include "localconsts.h"
 
+#include "debug.h"
+
 static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
 {
-    PHYSFS_file *handle = (PHYSFS_file *) rw->hidden.unknown.data1;
+    PHYSFS_file *handle = static_cast<PHYSFS_file *>(rw->hidden.unknown.data1);
     int pos = 0;
 
     if (whence == SEEK_SET)
@@ -46,8 +48,8 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
             return -1;
         } /* if */
 
-        pos = (int)current;
-        if (((PHYSFS_sint64)pos) != current)
+        pos = static_cast<int>(current);
+        if (static_cast<PHYSFS_sint64>(pos) != current)
         {
             SDL_SetError("Can't fit current file position in an int!");
             return -1;
@@ -67,8 +69,8 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
             return -1;
         } /* if */
 
-        pos = (int)len;
-        if (((PHYSFS_sint64)pos) != len)
+        pos = static_cast<int>(len);
+        if (static_cast<PHYSFS_sint64>(pos) != len)
         {
             SDL_SetError("Can't fit end-of-file position in an int!");
             return -1;
@@ -88,7 +90,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
         return -1;
     } /* if */
 
-    if (!PHYSFS_seek(handle, (PHYSFS_uint64) pos))
+    if (!PHYSFS_seek(handle, static_cast<PHYSFS_uint64>(pos)))
     {
         SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
         return -1;
@@ -99,7 +101,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
 
 static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum)
 {
-    PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1;
+    PHYSFS_file *handle = static_cast<PHYSFS_file*>(rw->hidden.unknown.data1);
     PHYSFS_sint64 rc = PHYSFS_read(handle, ptr, size, maxnum);
     if (rc != maxnum)
     {
@@ -107,22 +109,22 @@ static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum)
             SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
     } /* if */
 
-    return (int)rc;
+    return static_cast<int>(rc);
 } /* physfsrwops_read */
 
 static int physfsrwops_write(SDL_RWops *rw, const void *ptr, int size, int num)
 {
-    PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1;
+    PHYSFS_file *handle = static_cast<PHYSFS_file*>(rw->hidden.unknown.data1);
     PHYSFS_sint64 rc = PHYSFS_write(handle, ptr, size, num);
     if (rc != num)
         SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
 
-    return (int) rc;
+    return static_cast<int>(rc);
 } /* physfsrwops_write */
 
 static int physfsrwops_close(SDL_RWops *rw)
 {
-    PHYSFS_file *handle = (PHYSFS_file*)rw->hidden.unknown.data1;
+    PHYSFS_file *handle = static_cast<PHYSFS_file*>(rw->hidden.unknown.data1);
     if (!PHYSFS_close(handle))
     {
         SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index 4a2081514..0106c597d 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -112,12 +112,12 @@ int execFile(std::string pathName, std::string name,
             if (arg2.empty())
             {
                 execl(pathName.c_str(), name.c_str(),
-                      arg1.c_str(), (char *)nullptr);
+                   arg1.c_str(), static_cast<char *>(nullptr));
             }
             else
             {
-                execl(pathName.c_str(), name.c_str(),
-                      arg1.c_str(), arg2.c_str(), (char *)nullptr);
+                execl(pathName.c_str(), name.c_str(), arg1.c_str(),
+                    arg2.c_str(), static_cast<char *>(nullptr));
             }
             exit(-1);
         }
@@ -130,7 +130,7 @@ int execFile(std::string pathName, std::string name,
         }
         else if (!sleep_pid)
         {   // sleep pid
-            sleep (timeOut);
+            sleep (waitTime);
 //            printf ("time out\n");
             exit(-1);
         }
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 9184ba79d..5a7ea87fd 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -28,6 +28,8 @@
 #include <cstdio>
 #include <list>
 
+#include <sys/time.h>
+
 #include "debug.h"
 
 static int UTF8_MAX_SIZE = 10;
@@ -520,9 +522,9 @@ std::string stringToHexPath(const std::string &str)
     if (str.empty())
         return "";
 
-    std::string hex = strprintf("%%%2x/", (int)str[0]);
+    std::string hex = strprintf("%%%2x/", static_cast<int>(str[0]));
     for (unsigned f = 1; f < str.size(); f ++)
-        hex += strprintf("%%%2x", (int)str[f]);
+        hex += strprintf("%%%2x", static_cast<int>(str[f]));
     return hex;
 }
 
@@ -598,7 +600,7 @@ bool findCutFirst(std::string &str1, std::string str2)
 std::string &removeProtocol(std::string &url)
 {
     int i = url.find("://");
-    if (i != (int)std::string::npos)
+    if (i != static_cast<int>(std::string::npos))
         url = url.substr(i + 3);
     return url;
 }
@@ -609,3 +611,17 @@ bool strStartWith(std::string str1, std::string str2)
         return false;
     return str1.substr(0, str2.size()) == str2;
 }
+
+std::string getDateString()
+{
+    char buffer[80];
+
+    time_t rawtime;
+    struct tm *timeinfo;
+
+    time (&rawtime);
+    timeinfo = localtime(&rawtime);
+
+    strftime(buffer, 79, "%Y-%m-%d", timeinfo);
+    return std::string(buffer);
+}
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 47d495dd0..31ee6d51f 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -206,4 +206,6 @@ std::string &removeProtocol(std::string &url);
 
 bool strStartWith(std::string str, std::string start);
 
+std::string getDateString();
+
 #endif // UTILS_STRINGUTILS_H
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp
index 24d2ee4d4..521774592 100644
--- a/src/utils/translation/poparser.cpp
+++ b/src/utils/translation/poparser.cpp
@@ -144,7 +144,7 @@ bool PoParser::readMsgId()
             mLine = "";
             return true;
         }
-        // stop reading if we dont read msgid before
+        // stop reading if we don't read msgid before
         return mMsgId.empty();
     }
 }
diff --git a/src/winver.h b/src/winver.h
index 4ff552db1..164c304ba 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -1,3 +1,23 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 /* VERSION DEFINITIONS */
 #define VER_MAJOR 1
 #define VER_MINOR 0